diff --git a/frontend/app/scripts/components/organisation/OrgCaseTemplateModalCtrl.js b/frontend/app/scripts/components/organisation/OrgCaseTemplateModalCtrl.js
index dca5e3ee17..6f3cc4bf4d 100644
--- a/frontend/app/scripts/components/organisation/OrgCaseTemplateModalCtrl.js
+++ b/frontend/app/scripts/components/organisation/OrgCaseTemplateModalCtrl.js
@@ -235,7 +235,7 @@
             };
 
             self.getTags = function (query) {
-                return TagSrv.getTags(query);
+                return TagSrv.autoComplete(query);
             };
         });
 })();
diff --git a/frontend/app/scripts/controllers/case/CaseCreationCtrl.js b/frontend/app/scripts/controllers/case/CaseCreationCtrl.js
index 0c7cc96478..724e46b3d7 100644
--- a/frontend/app/scripts/controllers/case/CaseCreationCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseCreationCtrl.js
@@ -112,7 +112,7 @@
             };
 
             $scope.getTags = function(query) {
-                return TagSrv.getTags(query);
+                return TagSrv.autoComplete(query);
             };
 
             $scope.keys = function(o) {
diff --git a/frontend/app/scripts/controllers/case/CaseDetailsCtrl.js b/frontend/app/scripts/controllers/case/CaseDetailsCtrl.js
index e41a9b1fbe..063992240a 100644
--- a/frontend/app/scripts/controllers/case/CaseDetailsCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseDetailsCtrl.js
@@ -64,7 +64,7 @@
         };
 
         $scope.getCaseTags = function(query) {
-            return TagSrv.getTags(query);
+            return TagSrv.autoComplete(query);
         };
     });
 
diff --git a/frontend/app/scripts/controllers/case/CaseObservablesItemCtrl.js b/frontend/app/scripts/controllers/case/CaseObservablesItemCtrl.js
index 847a1129f3..1e79006afd 100644
--- a/frontend/app/scripts/controllers/case/CaseObservablesItemCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseObservablesItemCtrl.js
@@ -310,7 +310,7 @@
             };
 
             $scope.getTags = function(query) {
-                return TagSrv.getTags(query);
+                return TagSrv.autoComplete(query);
             };
 
             $scope.loadShares = function () {
diff --git a/frontend/app/scripts/controllers/case/CaseUpdateCtrl.js b/frontend/app/scripts/controllers/case/CaseUpdateCtrl.js
index 148d5a821c..d099ab5c7b 100644
--- a/frontend/app/scripts/controllers/case/CaseUpdateCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseUpdateCtrl.js
@@ -134,7 +134,7 @@
             };
 
             this.getTags = function(query) {
-                return TagSrv.getTags(query);
+                return TagSrv.autoComplete(query);
             };
 
             self.fromTagLibrary = function(field) {
diff --git a/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js b/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
index da6e7f70e4..a41c930dc8 100644
--- a/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
+++ b/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
@@ -196,7 +196,7 @@
             };
 
             $scope.getTags = function(query) {
-                return TagSrv.getTags(query);
+                return TagSrv.autoComplete(query);
             };
         }
     );
diff --git a/frontend/app/scripts/controllers/case/ObservableUpdateCtrl.js b/frontend/app/scripts/controllers/case/ObservableUpdateCtrl.js
index 78c597012f..f596796264 100644
--- a/frontend/app/scripts/controllers/case/ObservableUpdateCtrl.js
+++ b/frontend/app/scripts/controllers/case/ObservableUpdateCtrl.js
@@ -137,7 +137,7 @@
             };
 
             this.getTags = function(query) {
-                return TagSrv.getTags(query);
+                return TagSrv.autoComplete(query);
             };
 
             self.fromTagLibrary = function(field) {
diff --git a/frontend/app/scripts/directives/dashboard/filter-editor.js b/frontend/app/scripts/directives/dashboard/filter-editor.js
index dbfb2ab552..e74f86b7bd 100644
--- a/frontend/app/scripts/directives/dashboard/filter-editor.js
+++ b/frontend/app/scripts/directives/dashboard/filter-editor.js
@@ -77,7 +77,7 @@
                     var promise = null;
 
                     if(field.name === 'tags') {
-                        return TagSrv.getTags(query);
+                        return TagSrv.autoComplete(query);
                     } else if(field.type === 'user') {
                         promise = AuthenticationSrv.current()
                             .then(function(user) {
diff --git a/frontend/app/scripts/services/api/TagSrv.js b/frontend/app/scripts/services/api/TagSrv.js
index 273cd41535..7d73604788 100644
--- a/frontend/app/scripts/services/api/TagSrv.js
+++ b/frontend/app/scripts/services/api/TagSrv.js
@@ -20,7 +20,7 @@
 
                 QuerySrv.query('v1', operations, {
                     params: {
-                        name: 'tags-auto-complete'
+                        name: 'list-tags'
                     }
                 }).then(function(response) {
                     defer.resolve(_.map(response.data, function(tag) {
@@ -31,5 +31,23 @@
                 return defer.promise;
             };
 
+            this.autoComplete = function(term) {
+                var defer = $q.defer();
+
+                var operations = [
+                    { _name: 'tagAutoComplete', freeTag: term, limit: 20}
+                ]
+
+                QuerySrv.call('v1', operations, {
+                    name: 'tags-auto-complete'
+                }).then(function(response) {
+                    defer.resolve(_.map(response, function(tag) {
+                        return {text: tag};
+                    }));
+                });
+
+                return defer.promise;
+            };
+
         });
 })();