diff --git a/frontend/app/scripts/components/alert/AlertObservableListCmp.js b/frontend/app/scripts/components/alert/AlertObservableListCmp.js
index 8344ca5c71..1e7b032827 100644
--- a/frontend/app/scripts/components/alert/AlertObservableListCmp.js
+++ b/frontend/app/scripts/components/alert/AlertObservableListCmp.js
@@ -7,7 +7,7 @@
                 var self = this;
 
                 self.$onInit = function() {
-                    this.filtering = new FilteringSrv('case_artifact', 'alert.dialog.observables', {
+                    this.filtering = new FilteringSrv('observable', 'alert.dialog.observables', {
                         version: 'v1',
                         defaults: {
                             showFilters: false,
diff --git a/frontend/app/scripts/controllers/MainPageCtrl.js b/frontend/app/scripts/controllers/MainPageCtrl.js
index 8320212b90..e1980eb669 100644
--- a/frontend/app/scripts/controllers/MainPageCtrl.js
+++ b/frontend/app/scripts/controllers/MainPageCtrl.js
@@ -31,7 +31,7 @@
                     self.view.data = 'waitingtasks';
                 }
 
-                self.filtering = new FilteringSrv('case_task', $stateParams.viewId + '.list', {
+                self.filtering = new FilteringSrv('task', $stateParams.viewId + '.list', {
                     version: 'v1',
                     defaults: {
                         showFilters: true,
diff --git a/frontend/app/scripts/controllers/case/CaseTasksCtrl.js b/frontend/app/scripts/controllers/case/CaseTasksCtrl.js
index ae277fea63..da9ee1f483 100755
--- a/frontend/app/scripts/controllers/case/CaseTasksCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseTasksCtrl.js
@@ -19,7 +19,7 @@
         $scope.collapseOptions = {};
 
         this.$onInit = function() {
-            $scope.filtering = new FilteringSrv('case_task', 'task.list', {
+            $scope.filtering = new FilteringSrv('task', 'task.list', {
                 version: 'v1',
                 defaults: {
                     showFilters: true,
diff --git a/frontend/app/views/partials/case/case.list.html b/frontend/app/views/partials/case/case.list.html
index 36e3c63db6..358b7f54e5 100644
--- a/frontend/app/views/partials/case/case.list.html
+++ b/frontend/app/views/partials/case/case.list.html
@@ -76,8 +76,8 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseCount}
                                             </span>
                                         </div>
 
-                                        <custom-field-labels ng-if="$vm.filtering.context.showAdvanced" custom-fields="currentCase.customFields" on-field-click="$vm.addFilterValue(name, value)"><custom-field-labels>
-
+                                        <custom-field-labels ng-if="$vm.filtering.context.showAdvanced" custom-fields="currentCase.customFields" on-field-click="$vm.addFilterValue(name, value)"></custom-field-labels>
+                                        
                                         <div class="text-success" ng-show="currentCase.status !== 'Open'">
                                             <small>
                                                 (Closed at {{currentCase.endDate | showDate}} as <strong>{{$vm.CaseResolutionStatus[currentCase.resolutionStatus]}}</strong>)