diff --git a/_config.yml b/_config.yml
index 8ea31edd3..810f8fd28 100755
--- a/_config.yml
+++ b/_config.yml
@@ -531,6 +531,7 @@ firestore:
   collection: articles #required, a string collection name to access firestore database
   apiKey: #required
   projectId: #required
+  bluebird: false #enable this if you want to include bluebird 3.5.1(core version) Promise polyfill
 
 # Show PV/UV of the website/page with busuanzi.
 # Get more information on http://ibruce.info/2015/04/04/busuanzi/
diff --git a/layout/_third-party/analytics/firestore.swig b/layout/_third-party/analytics/firestore.swig
index 3cd5f7c7f..7493c75f2 100644
--- a/layout/_third-party/analytics/firestore.swig
+++ b/layout/_third-party/analytics/firestore.swig
@@ -1,54 +1,99 @@
 {% if theme.firestore.enable %}
-<script src="https://www.gstatic.com/firebasejs/4.6.0/firebase.js"></script>
-<script src="https://www.gstatic.com/firebasejs/4.6.0/firebase-firestore.js"></script>
-<script>
-	(function(){
-		var title='{{ page.title }}'
-		if(title){
-
-			firebase.initializeApp({
-				apiKey: '{{ theme.firestore.apiKey }}',
-				projectId: '{{ theme.firestore.projectId }}'
-			})
-
-
-			var db = firebase.firestore()
-			var articles=db.collection('{{ theme.firestore.collection }}')
-			var doc=articles.doc(title)
-
-			doc.get().then(function(d){
-				var count
-				if(!d.exists){ //has no data, initialize count
-					doc.set({
-						count: 1
-					})
-					count=1
-				}
-				else{ //has data
-					count=d.data().count
-					if(!(window.localStorage&&window.localStorage.getItem(title))){ //if first view this article
-						doc.set({ //increase count
-							count: count+1
-						})
-            count++
-					}
-				}
-        if(window.localStorage){ //mark as visited
-          localStorage.setItem(title,true)
+  <script src="https://www.gstatic.com/firebasejs/4.6.0/firebase.js"></script>
+  <script src="https://www.gstatic.com/firebasejs/4.6.0/firebase-firestore.js"></script>
+  {% if theme.firestore.bluebird %}
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.5.1/bluebird.core.min.js"></script>
+  {% endif %}
+  <script>
+    (function () {
+
+      firebase.initializeApp({
+        apiKey: '{{ theme.firestore.apiKey }}',
+        projectId: '{{ theme.firestore.projectId }}'
+      })
+
+      function getCount(doc, increaseCount) {
+        //increaseCount will be false when not in article page
+
+        return doc.get().then(function (d) {
+          var count
+          if (!d.exists) { //has no data, initialize count
+            if (increaseCount) {
+              doc.set({
+                count: 1
+              })
+              count = 1
+            }
+            else {
+              count = 0
+            }
+          }
+          else { //has data
+            count = d.data().count
+            if (increaseCount) {
+              if (!(window.localStorage && window.localStorage.getItem(title))) { //if first view this article
+                doc.set({ //increase count
+                  count: count + 1
+                })
+                count++
+              }
+            }
+          }
+          if (window.localStorage && increaseCount) { //mark as visited
+            localStorage.setItem(title, true)
+          }
+
+          return count
+        })
+      }
+
+      function appendCountTo(el) {
+        return function (count) {
+          $(el).append(
+            $('<span>').addClass('post-visitors-count').append(
+              $('<span>').addClass('post-meta-divider').text('|')
+            ).append(
+              $('<span>').addClass('post-meta-item-icon').append(
+                $('<i>').addClass('fa fa-users')
+              )
+              ).append($('<span>').text('{{ __("post.visitors")}} ' + count))
+          )
         }
+      }
+
+      var db = firebase.firestore()
+      var articles = db.collection('{{ theme.firestore.collection }}')
+
+      //https://hexo.io/zh-tw/docs/variables.html
+      var isPost = '{{ page.title }}'.length > 0
+      var isArchive = '{{ archive }}' === 'true'
+      var isCategory = '{{ category }}'.length > 0
+      var isTag = '{{ tag }}'.length > 0
+
+      if (isPost) { //is article page
+        var title = '{{ page.title }}'
+        var doc = articles.doc(title)
+
+        getCount(doc, true).then(appendCountTo($('.post-meta')))
+      }
+      else if (!isArchive && !isCategory && !isTag) { //is index page
+        var titles = [] //array to titles
+
+        var postsstr = '{% for post in page.posts %}titles.push("{{ post.title }}");{% endfor %}' //if you have a better way to get titles of posts, please change it
+        eval(postsstr)
 
-        //append to meta
-				$('.post-meta').append(
-          $('<span>').addClass('post-visitors-count').append(
-            $('<span>').addClass('post-meta-divider').text('|')
-          ).append(
-            $('<span>').addClass('post-meta-item-icon').append(
-              $('<i>').addClass('fa fa-users')
-            )
-          ).append($('<span>').text('{{ __("post.visitors")}} '+count))
-        )
-			})
-		}
-	})()
-</script>
+        var promises = titles.map(function (title) {
+          return articles.doc(title)
+        }).map(function (doc) {
+          return getCount(doc)
+        })
+        Promise.all(promises).then(function (counts) {
+          var metas = $('.post-meta')
+          counts.forEach(function (val, idx) {
+            appendCountTo(metas[idx])(val)
+          })
+        })
+      }
+    })()
+  </script>
 {% endif %}