diff --git a/ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.ts b/ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.ts
index d8b1a21f6a..b210605d95 100644
--- a/ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.ts
@@ -70,7 +70,8 @@ export class KeyFilterDialogComponent extends
   entityKeyTypes =
     this.data.telemetryKeysOnly ?
       [EntityKeyType.ATTRIBUTE, EntityKeyType.TIME_SERIES, EntityKeyType.CONSTANT] :
-      [EntityKeyType.ENTITY_FIELD, EntityKeyType.ATTRIBUTE, EntityKeyType.TIME_SERIES];
+      [EntityKeyType.ENTITY_FIELD, EntityKeyType.ATTRIBUTE, EntityKeyType.CLIENT_ATTRIBUTE,
+        EntityKeyType.SERVER_ATTRIBUTE, EntityKeyType.SHARED_ATTRIBUTE, EntityKeyType.TIME_SERIES];
 
   entityKeyTypeTranslations = entityKeyTypeTranslationMap;
 
diff --git a/ui-ngx/src/app/shared/models/query/query.models.ts b/ui-ngx/src/app/shared/models/query/query.models.ts
index 5e4e7b3527..696ce5c3fb 100644
--- a/ui-ngx/src/app/shared/models/query/query.models.ts
+++ b/ui-ngx/src/app/shared/models/query/query.models.ts
@@ -54,7 +54,10 @@ export const entityKeyTypeTranslationMap = new Map<EntityKeyType, string>(
     [EntityKeyType.ATTRIBUTE, 'filter.key-type.attribute'],
     [EntityKeyType.TIME_SERIES, 'filter.key-type.timeseries'],
     [EntityKeyType.ENTITY_FIELD, 'filter.key-type.entity-field'],
-    [EntityKeyType.CONSTANT, 'filter.key-type.constant']
+    [EntityKeyType.CONSTANT, 'filter.key-type.constant'],
+    [EntityKeyType.CLIENT_ATTRIBUTE, 'filter.key-type.client-attribute'],
+    [EntityKeyType.SERVER_ATTRIBUTE, 'filter.key-type.server-attribute'],
+    [EntityKeyType.SHARED_ATTRIBUTE, 'filter.key-type.shared-attribute']
   ]
 );
 
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 76c30d46ae..cfae20cbe4 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2595,7 +2595,10 @@
            "attribute": "Attribute",
            "timeseries": "Timeseries",
            "entity-field": "Entity field",
-           "constant": "Constant"
+           "constant": "Constant",
+           "client-attribute": "Client attribute",
+           "server-attribute": "Server attribute",
+           "shared-attribute": "Shared attribute"
          },
          "value-type": {
            "value-type": "Value type",