diff --git a/frontend/app/views/components/alert/observable-list.component.html b/frontend/app/views/components/alert/observable-list.component.html
index 972b390937..131bca24ed 100644
--- a/frontend/app/views/components/alert/observable-list.component.html
+++ b/frontend/app/views/components/alert/observable-list.component.html
@@ -51,7 +51,7 @@
                           </div>
                           <div class="case-tags flexwrap mt-xxs" ng-if="observable.tags.length > 0">
                               <strong><i class="fa fa-tags mr-xxxs"></i></strong>
-                              <span ng-repeat="tag in observable.tags track by $index" class="label label-primary mb-xxxs mr-xxxs" ng-click="$cmp.addFilterValue('tags', tag)">{{tag}}</span>
+                              <tag-item ng-repeat="tag in observable.tags track by $index" ng-click="$cmp.addFilterValue('tags', tag)" value="tag"></tag-item>
                           </div>
                         </td>
                         <td>
diff --git a/frontend/app/views/components/alert/similar-case-list.component.html b/frontend/app/views/components/alert/similar-case-list.component.html
index 25a19018ac..e002795e15 100644
--- a/frontend/app/views/components/alert/similar-case-list.component.html
+++ b/frontend/app/views/components/alert/similar-case-list.component.html
@@ -114,7 +114,7 @@
                         <div class="case-tags flexwrap mt-xxs">
                             <span class="mr-xxxs text-muted"><i class="fa fa-tags"></i></span>
                             <strong class="text-muted mr-xxxs" ng-if="!item.case.tags || item.case.tags.length === 0">None</strong>
-                            <span ng-repeat="tag in item.case.tags track by $index" ng-click="$cmp.addFilterValue('tags', tag)" class="label label-primary mb-xxxs mr-xxxs pointer">{{tag}}</span>
+                            <tag-item ng-repeat="tag in item.case.tags track by $index" ng-click="$cmp.addFilterValue('tags', tag)" class="pointer" value="tag"></tag-item>
                         </div>
                         <div class="text-success" ng-show="item.case.status !== 'Open'">
                             <small>
diff --git a/frontend/app/views/directives/report-observables.html b/frontend/app/views/directives/report-observables.html
index a221402c9a..6efdd69d6a 100644
--- a/frontend/app/views/directives/report-observables.html
+++ b/frontend/app/views/directives/report-observables.html
@@ -56,10 +56,7 @@
                         <div class="case-tags flexwrap mt-xxs">
                             <span class="mr-xxxs text-muted"><i class="fa fa-tags"></i></span>
                             <strong class="text-muted mr-xxxs" ng-if="!observable.tags || observable.tags.length === 0">None</strong>
-                            <span class="label label-primary mb-xxxs mr-xxxs pointer"
-                                ng-repeat="tag in observable.tags track by $index">
-                                {{tag}}
-                            </span>
+                            <tag-item class="pointer" ng-repeat="tag in observable.tags track by $index" value="tag"></tag-item>
                         </div>
                     </td>
                     <td class="wrap">
diff --git a/frontend/app/views/partials/observables/details/summary.html b/frontend/app/views/partials/observables/details/summary.html
index bc01374393..a2bc9b0bf2 100644
--- a/frontend/app/views/partials/observables/details/summary.html
+++ b/frontend/app/views/partials/observables/details/summary.html
@@ -95,7 +95,7 @@ <h4 class="vpad10 text-primary">
         <dl class="dl-horizontal">
             <dt class="pull-left">Tags</dt>
             <dd ng-if="canEdit">
-                <updatable-tags value="artifact.tags" on-update="updateField('tags', getLabels(newValue))" source="getTags"></updatable-tags>
+                <updatable-tag-list on-update="updateField('tags', getLabels(newValue))" value="artifact.tags" source="getTags"></updatable-tag-list>
             </dd>
             <dd ng-if="!canEdit">
                 <tag-list ng-if="artifact.tags.length > 0" data="artifact.tags"></tag-list>