diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
index bb168af521..93057a7b06 100644
--- a/frontend/app/scripts/controllers/RootCtrl.js
+++ b/frontend/app/scripts/controllers/RootCtrl.js
@@ -68,8 +68,8 @@ angular.module('theHiveControllers').controller('RootCtrl',
                     name: 'my-tasks.stats'
                 }
             },
-            onUpdate: function(updates) {
-                $scope.myCurrentTasksCount = updates;
+            onUpdate: function(data) {
+                $scope.myCurrentTasksCount = data;
             }
         });
 
@@ -85,13 +85,28 @@ angular.module('theHiveControllers').controller('RootCtrl',
                     name: 'waiting-tasks.stats'
                 }
             },
-            onUpdate: function(updates) {
-                $scope.waitingTasksCount = updates;
+            onUpdate: function(data) {
+                $scope.waitingTasksCount = data;
             }
         });
 
-        // Get Alert counts
-        $scope.alertEvents = AlertingSrv.stats($scope);
+        StreamQuerySrv('v1', [
+            {_name: 'listAlert'},
+            {_name: 'filter', _field: 'read', _value: false},
+            {_name: 'count'}
+        ], {
+            scope: $scope,
+            rootId: 'any',
+            objectType: 'alert',
+            query: {
+                params: {
+                    name: 'unread-alert-count'
+                }
+            },
+            onUpdate: function(data) {
+                $scope.unreadAlertCount = data;
+            }
+        });
 
         $scope.$on('templates:refresh', function(){
             CaseTemplateSrv.list().then(function(templates) {
@@ -104,9 +119,13 @@ angular.module('theHiveControllers').controller('RootCtrl',
             $scope.initCustomFieldsCache();
         });
 
-        $scope.$on('alert:event-imported', function() {
-            $scope.alertEvents = AlertingSrv.stats($scope);
-        });
+
+        // Get Alert counts
+        //$scope.alertEvents = AlertingSrv.stats($scope);
+
+        // $scope.$on('alert:event-imported', function() {
+        //     $scope.alertEvents = AlertingSrv.stats($scope);
+        // });
 
         // FIXME
         // $scope.$on('misp:status-updated', function(event, enabled) {
diff --git a/frontend/app/scripts/controllers/alert/AlertListCtrl.js b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
index b9b77a2b95..b21bdb7a05 100755
--- a/frontend/app/scripts/controllers/alert/AlertListCtrl.js
+++ b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
@@ -2,7 +2,7 @@
 (function() {
     'use strict';
     angular.module('theHiveControllers')
-        .controller('AlertListCtrl', function($rootScope, $scope, $q, $state, $uibModal, TagSrv, CaseTemplateSrv, ModalUtilsSrv, AlertingSrv, NotificationSrv, FilteringSrv, CortexSrv, Severity, VersionSrv) {
+        .controller('AlertListCtrl', function($rootScope, $scope, $q, $state, $uibModal, TagSrv, StreamQuerySrv, CaseTemplateSrv, ModalUtilsSrv, AlertingSrv, NotificationSrv, FilteringSrv, CortexSrv, Severity, VersionSrv) {
             var self = this;
 
             self.urls = VersionSrv.mispUrls();
@@ -44,6 +44,23 @@
                             self.filtering.setPageSize(newValue);
                         });
                     });
+
+                StreamQuerySrv('v1', [
+                    {_name: 'listAlert'},
+                    {_name: 'count'}
+                ], {
+                    scope: $scope,
+                    rootId: 'any',
+                    objectType: 'alert',
+                    query: {
+                        params: {
+                            name: 'alert-count'
+                        }
+                    },
+                    onUpdate: function(data) {
+                        self.alertListCount = data;
+                    }
+                });
             };
 
             self.load = function() {
diff --git a/frontend/app/views/components/header.component.html b/frontend/app/views/components/header.component.html
index b17e500957..497dcd2a85 100644
--- a/frontend/app/views/components/header.component.html
+++ b/frontend/app/views/components/header.component.html
@@ -27,18 +27,18 @@
                 </li>
                 <li ui-sref-active="active">
                     <a ui-sref="app.main({viewId: 'mytasks'})">My tasks
-                        <span class="badge alert-danger">{{myCurrentTasksCount}}</span>
+                        <span class="badge alert-danger">{{myCurrentTasksCount || 0}}</span>
                     </a>
                 </li>
                 <li ui-sref-active="active">
                     <a ui-sref="app.main({viewId: 'waitingtasks'})">Waiting tasks
-                        <span class="badge alert-danger">{{waitingTasksCount}}</span>
+                        <span class="badge alert-danger">{{waitingTasksCount || 0}}</span>
                     </a>
                 </li>
                 <li ui-sref-active="active">
                     <a href ui-sref="app.alert-list">
                         Alerts
-                        <span class="badge alert-danger">{{(alertEvents.New.count || 0)  + (alertEvents.Updated.count || 0)}}</span>
+                        <span class="badge alert-danger">{{unreadAlertCount || 0}}</span>
                     </a>
                 </li>
                 <li class="hdivider hidden-xs"></li>
diff --git a/frontend/app/views/partials/alert/list.html b/frontend/app/views/partials/alert/list.html
index 2ece25e7dd..f1e90b81c8 100644
--- a/frontend/app/views/partials/alert/list.html
+++ b/frontend/app/views/partials/alert/list.html
@@ -2,7 +2,7 @@
     <div class="col-md-12">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{alertEvents.count}})</h3>
+                <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{$vm.alertListCount}})</h3>
             </div>
             <div class="box-body">
                 <div ng-include="'views/partials/alert/list/toolbar.html'"></div>
diff --git a/frontend/app/views/partials/alert/list/toolbar.html b/frontend/app/views/partials/alert/list/toolbar.html
index 47d0c1dbcf..52342a720e 100644
--- a/frontend/app/views/partials/alert/list/toolbar.html
+++ b/frontend/app/views/partials/alert/list/toolbar.html
@@ -47,13 +47,6 @@
                     <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu" uib-dropdown-menu>
-                    <!-- TODO nadouani: fix this filter -->
-                    <!-- <li>
-                        <a class="clickable" ng-click="$vm.filterByNewAndUpdated()">New & Updated events ({{(alertEvents.Updated.count || 0) + (alertEvents.New.count || 0)}})</a>
-                    </li> -->
-                    <!-- <li>
-                        <a class="clickable" ng-click="$vm.filterByStatus(false)">New events ({{alertEvents.New.count || 0}})</a>
-                    </li> -->
                     <li>
                         <a class="clickable" ng-click="$vm.filterBy('read', true)"><i class="fa fa-envelope-open-o"></i> Read events</a>
                     </li>