diff --git a/app/assets/javascripts/app/controllers/tags.js b/app/assets/javascripts/app/controllers/tags.js
index 1a8577857..c3d08ae94 100644
--- a/app/assets/javascripts/app/controllers/tags.js
+++ b/app/assets/javascripts/app/controllers/tags.js
@@ -18,17 +18,18 @@ angular.module('app')
     }
   })
   .controller('TagsCtrl', function ($rootScope, modelManager, syncManager, $timeout, componentManager, authManager) {
-    let initialLoad = true;
+    // Wrap in timeout so that selectTag is defined
+    $timeout(() => {
+      this.smartTags = modelManager.getSmartTags();
+      this.selectTag(this.smartTags[0]);
+    })
 
     syncManager.addEventHandler((syncEvent, data) => {
-      if(syncEvent == "initial-data-loaded" || syncEvent == "sync:completed") {
+      if(syncEvent == "local-data-loaded"
+        || syncEvent == "sync:completed"
+        || syncEvent == "local-data-incremental-load") {
         this.tags = modelManager.tags;
         this.smartTags = modelManager.getSmartTags();
-
-        if(initialLoad) {
-          initialLoad = false;
-          this.selectTag(this.smartTags[0]);
-        }
       }
     });
 
diff --git a/app/assets/templates/tags.html.haml b/app/assets/templates/tags.html.haml
index 91fa05f60..fd2e90c08 100644
--- a/app/assets/templates/tags.html.haml
+++ b/app/assets/templates/tags.html.haml
@@ -17,6 +17,7 @@
         "ng-class" => "{'selected' : ctrl.selectedTag == tag, 'faded' : !tag.content.isAllTag}"}
           .info
             %input.title{"ng-disabled" => "true", "ng-model" => "tag.title"}
+            .count{"ng-show" => "tag.content.isAllTag"} {{ctrl.noteCount(tag)}}
 
         .tags-title-section.section-title-bar
           .section-title-bar-header
diff --git a/package-lock.json b/package-lock.json
index fda46927d..6b862349d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.0.3-beta1",
+  "version": "3.0.3-beta2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8097,9 +8097,9 @@
       "dev": true
     },
     "standard-file-js": {
-      "version": "0.3.32",
-      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.32.tgz",
-      "integrity": "sha512-1QP7IJ3MJC+5av9bXVy1IIxBnZy2PzcEW+b835XRC2N4bEEIPWMnabozlPLhErBe/Ey1mxvwltsG39mGGST2tA==",
+      "version": "0.3.34",
+      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.34.tgz",
+      "integrity": "sha512-N9Te01iArvtUuLeCB9z9/uBJDiMDqRyTPuvDJz/kanK8LzOJGQVjs76PUbud2TQMZ8CnIAXNVdqed0FmC0UjJg==",
       "dev": true
     },
     "static-extend": {
diff --git a/package.json b/package.json
index 939da642c..5a53df90f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.0.3-beta1",
+  "version": "3.0.3-beta2",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -45,7 +45,7 @@
     "serve-static": "^1.13.2",
     "sn-models": "0.1.12",
     "sn-stylekit": "2.0.13",
-    "standard-file-js": "0.3.32",
+    "standard-file-js": "0.3.34",
     "grunt-shell": "^2.1.0"
   }
 }