diff --git a/frontend/app/scripts/controllers/MainPageCtrl.js b/frontend/app/scripts/controllers/MainPageCtrl.js
index 0796b39570..9d293eafde 100644
--- a/frontend/app/scripts/controllers/MainPageCtrl.js
+++ b/frontend/app/scripts/controllers/MainPageCtrl.js
@@ -63,7 +63,8 @@
                     filter: self.filtering.buildQuery(),
                     baseFilter: self.defaultFilter,
                     operations: self.queryOperations,
-                    extraData: ['case']
+                    extraData: ['case'],
+                    name: $stateParams.viewId
                 });
             };
 
diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
index d69ecf94a2..bb168af521 100644
--- a/frontend/app/scripts/controllers/RootCtrl.js
+++ b/frontend/app/scripts/controllers/RootCtrl.js
@@ -2,7 +2,7 @@
  * Controller for main page
  */
 angular.module('theHiveControllers').controller('RootCtrl',
-    function($scope, $rootScope, $timeout, $uibModal, $location, $state, AuthenticationSrv, AlertingSrv, StreamSrv, StreamStatSrv, CaseSrv, CaseTemplateSrv, CustomFieldsSrv, NotificationSrv, AppLayoutSrv, VersionSrv, currentUser, appConfig) {
+    function($scope, $rootScope, $timeout, $uibModal, $location, $state, AuthenticationSrv, AlertingSrv, StreamSrv, StreamQuerySrv, CaseSrv, CaseTemplateSrv, CustomFieldsSrv, NotificationSrv, AppLayoutSrv, VersionSrv, currentUser, appConfig) {
         'use strict';
 
         if(currentUser === 520) {
@@ -54,36 +54,40 @@ angular.module('theHiveControllers').controller('RootCtrl',
             $scope.templates = templates;
         });
 
-        $scope.myCurrentTasks = StreamStatSrv({
+        StreamQuerySrv('v1', [
+            {_name: 'currentUser'},
+            {_name: 'tasks'},
+            {_name: 'filter', _ne: {_field: 'status', _value: 'Completed'}},
+            {_name: 'count'}
+        ], {
             scope: $scope,
             rootId: 'any',
+            objectType: 'case_task',
             query: {
-                '_and': [
-                    {
-                        '_in': {
-                            '_field': 'status',
-                            '_values': ['Waiting', 'InProgress']
-                        }
-                    },
-                    {
-                        'owner': $scope.currentUser.login
-                    }
-                ]
+                params: {
+                    name: 'my-tasks.stats'
+                }
             },
-            result: {},
-            objectType: 'case_task',
-            field: 'status'
+            onUpdate: function(updates) {
+                $scope.myCurrentTasksCount = updates;
+            }
         });
 
-        $scope.waitingTasks = StreamStatSrv({
+        StreamQuerySrv('v1', [
+            {_name: 'waitingTask'},
+            {_name: 'count'}
+        ], {
             scope: $scope,
             rootId: 'any',
+            objectType: 'case_task',
             query: {
-                'status': 'Waiting'
+                params: {
+                    name: 'waiting-tasks.stats'
+                }
             },
-            result: {},
-            objectType: 'case_task',
-            field: 'status'
+            onUpdate: function(updates) {
+                $scope.waitingTasksCount = updates;
+            }
         });
 
         // Get Alert counts
diff --git a/frontend/app/views/components/header.component.html b/frontend/app/views/components/header.component.html
index 391fb02dfb..b17e500957 100644
--- a/frontend/app/views/components/header.component.html
+++ b/frontend/app/views/components/header.component.html
@@ -27,12 +27,12 @@
                 </li>
                 <li ui-sref-active="active">
                     <a ui-sref="app.main({viewId: 'mytasks'})">My tasks
-                        <span class="badge alert-danger">{{myCurrentTasks.count}}</span>
+                        <span class="badge alert-danger">{{myCurrentTasksCount}}</span>
                     </a>
                 </li>
                 <li ui-sref-active="active">
                     <a ui-sref="app.main({viewId: 'waitingtasks'})">Waiting tasks
-                        <span class="badge alert-danger">{{waitingTasks.count}}</span>
+                        <span class="badge alert-danger">{{waitingTasksCount}}</span>
                     </a>
                 </li>
                 <li ui-sref-active="active">