diff --git a/app/utils/cluster.js b/app/utils/cluster.js
index 3494bebab..ccf641171 100644
--- a/app/utils/cluster.js
+++ b/app/utils/cluster.js
@@ -134,10 +134,15 @@ const buildSearchableDataForResource = (org, obj, { clusterId }) => {
     }
   });
 
+  var razeeNameFilterFunc = (val, key)=>{
+    return key.toString().match(/^(razee\.io|satellite\.cloud\.ibm\.com|cpdaas\.cloud\.ibm\.com)/i);
+  };
+
   var allAnnotations = _.get(obj, 'metadata.annotations', {});
-  var searchableAnnotationValues = _.filter(allAnnotations , (val, key)=>{
-    return key.toString().match(/^(razee|satellite)/i);
-  });
+  var searchableAnnotationValues = _.filter(allAnnotations , razeeNameFilterFunc);
+
+  var allLabels = _.get(obj, 'metadata.labels', {});
+  var searchableLabelValues = _.filter(allLabels , razeeNameFilterFunc);
 
   var searchableExpressionArr = _.uniq(_.union(
     _.map(out, (searchableAttr)=>{
@@ -145,12 +150,11 @@ const buildSearchableDataForResource = (org, obj, { clusterId }) => {
     }),
     [clusterId],
     searchableAnnotationValues,
+    searchableLabelValues,
   ));
 
   // not sure why we're joining by colon instead of space, but thats what was in the original code, so keeping it
   out['searchableExpression'] = searchableExpressionArr.join(' ');
-  // caps the length at 4kb
-  out['searchableExpression'] = out['searchableExpression'].slice(0, 4000);
 
   return out;
 };