diff --git a/ui-v2/app/controllers/dc/nodes/show.js b/ui-v2/app/controllers/dc/nodes/show.js
index 3b370e146..80c4c3287 100644
--- a/ui-v2/app/controllers/dc/nodes/show.js
+++ b/ui-v2/app/controllers/dc/nodes/show.js
@@ -26,10 +26,9 @@ export default Controller.extend(WithFiltering, {
       get(item, 'ID')
         .toLowerCase()
         .indexOf(term) !== -1 ||
-      (get(item, 'Tags') || [])
-        .join('')
-        .toLowerCase()
-        .indexOf(term) !== -1 ||
+      (get(item, 'Tags') || []).some(function(item) {
+        return item.toLowerCase().indexOf(term) !== -1;
+      }) ||
       get(item, 'Port')
         .toString()
         .toLowerCase()
diff --git a/ui-v2/app/controllers/dc/services/index.js b/ui-v2/app/controllers/dc/services/index.js
index 2497929e1..373ca6f30 100644
--- a/ui-v2/app/controllers/dc/services/index.js
+++ b/ui-v2/app/controllers/dc/services/index.js
@@ -31,10 +31,9 @@ export default Controller.extend(WithHealthFiltering, {
       (get(item, 'Name')
         .toLowerCase()
         .indexOf(term) !== -1 ||
-        (get(item, 'Tags') || [])
-          .join('')
-          .toLowerCase()
-          .indexOf(term) !== -1) &&
+        (get(item, 'Tags') || []).some(function(item) {
+          return item.toLowerCase().indexOf(term) !== -1;
+        })) &&
       item.hasStatus(status)
     );
   },