diff --git a/frontend/app/scripts/services/api/TagSrv.js b/frontend/app/scripts/services/api/TagSrv.js
index 8df9873fe8..e961ec91d4 100644
--- a/frontend/app/scripts/services/api/TagSrv.js
+++ b/frontend/app/scripts/services/api/TagSrv.js
@@ -1,45 +1,43 @@
 (function() {
     'use strict';
     angular.module('theHiveServices')
-        .service('TagSrv', function(StatSrv, $q) {
-
-            var getPromiseFor = function(objectType) {
-                return StatSrv.getPromise({
-                    objectType: objectType,
-                    field: 'tags',
-                    limit: 1000
-                });
-            };
-
-            var mapTags = function(collection, term) {
-                return _.map(_.filter(_.keys(collection), function(tag) {
-                    var regex = new RegExp(term, 'gi');
-                    return regex.test(tag);
-                }), function(tag) {
-                    return {text: tag};
-                });
-            };
+        .service('TagSrv', function(QuerySrv, $q) {
 
             var getTags = function(objectType, term) {
                 var defer = $q.defer();
 
-                getPromiseFor(objectType).then(function(response) {
-                    defer.resolve(mapTags(response.data, term) || []);
-                });
+                var operations = [
+                    { _name: 'listTag' },
+                    { _name: objectType },
+                    {
+                        _name: 'filter',
+                        _like: {
+                            _field: 'text',
+                            _value: '*' + term + '*'
+                        }
+                    },
+                    {
+                        _name: 'text'
+                    }
+                ];
+
+                // Get the list
+                QuerySrv.call('v0', operations)
+                    .then(function(data) {
+                        defer.resolve(_.map(data, function(tag) {
+                            return {text: tag};
+                        }));
+                    });
 
                 return defer.promise;
             };
 
             this.fromCases = function(term) {
-                return getTags('case', term);
-            };
-
-            this.fromAlerts = function(term) {
-                return getTags('alert', term);
+                return getTags('fromCase', term);
             };
 
             this.fromObservables = function(term) {
-                return getTags('case/artifact', term);
+                return getTags('fromObservable', term);
             };
 
         });
diff --git a/frontend/app/views/directives/updatable-tags.html b/frontend/app/views/directives/updatable-tags.html
index 16e23ba3c2..46ceceb402 100644
--- a/frontend/app/views/directives/updatable-tags.html
+++ b/frontend/app/views/directives/updatable-tags.html
@@ -16,7 +16,7 @@
 <span ng-show="updatable.updating">
     <div class="form-group">
         <tags-input class="ti-input-sm" min-length="2" ng-model="value" placeholder="Add labels" replace-spaces-with-dashes="false">
-            <auto-complete ng-if="source" min-length="1" debounceDelay="400" source="source($query)"></auto-complete>
+            <auto-complete ng-if="source" min-length="3" debounce-delay="400" source="source($query)"></auto-complete>
         </tags-input>
     </div>
     <div class="form-group">
diff --git a/frontend/app/views/partials/case/case.creation.html b/frontend/app/views/partials/case/case.creation.html
index 14c97a22a1..6e5e150af1 100644
--- a/frontend/app/views/partials/case/case.creation.html
+++ b/frontend/app/views/partials/case/case.creation.html
@@ -14,7 +14,7 @@ <h4 class="vpad10 text-primary">Case details</h4>
 
                         <input class="form-control input-sm" name="title" ng-if="!fromTemplate" ng-model="newCase.title" placeholder="Title" required type="text"/>
 
-                        <div class="input-group" ng-if="fromTemplate">                            
+                        <div class="input-group" ng-if="fromTemplate">
                             <span class="input-group-addon">{{template.titlePrefix}}</span>
                             <input class="form-control input-sm" name="title" ng-model="newCase.title" placeholder="Title" required type="text"/>
                         </div>
@@ -71,7 +71,7 @@ <h4 class="vpad10 text-primary">Case details</h4>
                             min-length="2"
                             ng-model="tags"
                             replace-spaces-with-dashes="false">
-                                <auto-complete min-length="1" debounceDelay="400" source="getTags($query)"></auto-complete>
+                                <auto-complete min-length="3" debounce-delay="400" source="getTags($query)"></auto-complete>
                             </tags-input>
                     </div>
                 </div>
diff --git a/frontend/app/views/partials/case/case.details.html b/frontend/app/views/partials/case/case.details.html
index 0b8fcab35a..076f07ef0c 100644
--- a/frontend/app/views/partials/case/case.details.html
+++ b/frontend/app/views/partials/case/case.details.html
@@ -68,7 +68,7 @@ <h4 class="vpad10 text-primary">Summary</h4>
             </dd>
         </dl>
 
-        <dl class="dl-horizontal clear">
+        <dl class="dl-horizontal">
             <dt class="pull-left">Tags</dt>
             <dd ng-if="canEdit">
                 <updatable-tags on-update="updateField('tags', getTags(newValue))" value="caze.tags" source="getCaseTags"></updatable-tags>
diff --git a/frontend/app/views/partials/observables/creation/form.html b/frontend/app/views/partials/observables/creation/form.html
index bc652cb16f..aedf952384 100644
--- a/frontend/app/views/partials/observables/creation/form.html
+++ b/frontend/app/views/partials/observables/creation/form.html
@@ -121,7 +121,7 @@
     <div class="col-md-9">
         <input type="hidden" name="tags" ng-model="params.tagNames" ng-required="!params.message.length"/>
         <tags-input name="tagsInput" ng-model="params.tags" class="ti-input-sm" placeholder="Add tags" replace-spaces-with-dashes="false" min-length="2">
-            <auto-complete min-length="1" debounceDelay="400" source="getTags($query)"></auto-complete>
+            <auto-complete min-length="3" debounce-delay="400" source="getTags($query)"></auto-complete>
         </tags-input>
         <p class="help-block" ng-show="observableForm.tags.$invalid && !observableForm.tagsInput.$pristine">The observable(s) description or tags are required.</p>
     </div>
diff --git a/frontend/app/views/partials/observables/observable.update.html b/frontend/app/views/partials/observables/observable.update.html
index 690cba2a9a..1959126add 100644
--- a/frontend/app/views/partials/observables/observable.update.html
+++ b/frontend/app/views/partials/observables/observable.update.html
@@ -48,7 +48,7 @@ <h3 class="modal-title">Update observable(s)</h3>
                 <tags-input name="addTagsInput" ng-model="$dialog.params.addTags" class="ti-input-sm"
                     placeholder="Add tags" replace-spaces-with-dashes="false" min-length="2"
                     on-tag-added="$dialog.toggleAddTags()">
-                    <auto-complete min-length="1" debounceDelay="400" source="$dialog.getTags($query)"></auto-complete>
+                    <auto-complete min-length="3" debounce-delay="400" source="$dialog.getTags($query)"></auto-complete>
                 </tags-input>
             </div>
         </div>
@@ -60,7 +60,7 @@ <h3 class="modal-title">Update observable(s)</h3>
                 <tags-input name="removeTagsInput" ng-model="$dialog.params.removeTags" class="ti-input-sm"
                     placeholder="Remove tags" replace-spaces-with-dashes="false" min-length="2"
                     on-tag-added="$dialog.toggleRemoveTags()">
-                    <auto-complete min-length="1" debounceDelay="400" source="$dialog.getTags($query)"></auto-complete>
+                    <auto-complete min-length="3" debounce-delay="400" source="$dialog.getTags($query)"></auto-complete>
                 </tags-input>
             </div>
         </div>