diff --git a/ui-v2/app/controllers/dc/nodes/show.js b/ui-v2/app/controllers/dc/nodes/show.js
index cec7398db..3b370e146 100644
--- a/ui-v2/app/controllers/dc/nodes/show.js
+++ b/ui-v2/app/controllers/dc/nodes/show.js
@@ -26,6 +26,10 @@ export default Controller.extend(WithFiltering, {
       get(item, 'ID')
         .toLowerCase()
         .indexOf(term) !== -1 ||
+      (get(item, 'Tags') || [])
+        .join('')
+        .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 283a6c420..2497929e1 100644
--- a/ui-v2/app/controllers/dc/services/index.js
+++ b/ui-v2/app/controllers/dc/services/index.js
@@ -26,10 +26,16 @@ const widthDeclaration = function(num) {
 };
 export default Controller.extend(WithHealthFiltering, {
   filter: function(item, { s = '', status = '' }) {
+    const term = s.toLowerCase();
     return (
-      get(item, 'Name')
+      (get(item, 'Name')
         .toLowerCase()
-        .indexOf(s.toLowerCase()) !== -1 && item.hasStatus(status)
+        .indexOf(term) !== -1 ||
+        (get(item, 'Tags') || [])
+          .join('')
+          .toLowerCase()
+          .indexOf(term) !== -1) &&
+      item.hasStatus(status)
     );
   },
   totalWidth: computed('{maxPassing,maxWarning,maxCritical}', function() {