diff --git a/scripts/tags/timeline.js b/scripts/tags/timeline.js
index 7ba8c9a..ae5c4cf 100644
--- a/scripts/tags/timeline.js
+++ b/scripts/tags/timeline.js
@@ -40,7 +40,9 @@ function postTimeline(args, content) {
   var el = '';
 
   if (args.api && args.api.length > 0) {
-    el += '<div class="tag-plugin timeline stellar-timeline-api" api="' + args.api + '">';
+    el += '<div class="tag-plugin timeline stellar-timeline-api"';
+    el += ' ' + hexo.args.joinTags(args, ['api']).join(' ');
+    el += '>';
   } else {
     el += '<div class="tag-plugin timeline">';
   }
diff --git a/source/js/plugins/timeline.js b/source/js/plugins/timeline.js
index 48dc474..86cc993 100644
--- a/source/js/plugins/timeline.js
+++ b/source/js/plugins/timeline.js
@@ -97,9 +97,9 @@ const StellarTimeline = {
             }
           }
         }
-        if (item.comments) {
+        if (item.comments != null) {
           cell += '<a class="item comments last" href="' + item.html_url + '" target="_blank" rel="external nofollow noopener noreferrer">';
-          cell += '<span>💬 ' + item.comments + '</span>';
+          cell += '<span>💬 ' + (item.comments || 0) + '</span>';
           cell += '</a>';
         }