diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/elasticsearch.constant.ts b/openmetadata-ui/src/main/resources/ui/src/constants/elasticsearch.constant.ts
index 2c0278b814b..f2905e91539 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/elasticsearch.constant.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/elasticsearch.constant.ts
@@ -21,21 +21,17 @@ export const ELASTIC_SEARCH_INDEX_ENTITIES = [
     value: 'table',
     label: t('label.table'),
   },
-  {
-    value: 'topic',
-    label: t('label.topic'),
-  },
   {
     value: 'dashboard',
     label: t('label.dashboard'),
   },
   {
-    value: 'pipeline',
-    label: t('label.pipeline'),
+    value: 'topic',
+    label: t('label.topic'),
   },
   {
-    value: 'mlmodel',
-    label: t('label.ml-model'),
+    value: 'pipeline',
+    label: t('label.pipeline'),
   },
   {
     value: 'user',
@@ -49,10 +45,56 @@ export const ELASTIC_SEARCH_INDEX_ENTITIES = [
     value: 'glossaryTerm',
     label: t('label.glossary-term'),
   },
+  {
+    value: 'mlmodel',
+    label: t('label.ml-model'),
+  },
   {
     value: 'tag',
     label: t('label.tag'),
   },
+  {
+    value: 'classification',
+    label: t('label.classification'),
+  },
+  {
+    value: 'query',
+    label: t('label.query'),
+  },
+  {
+    value: 'container',
+    label: t('label.container'),
+  },
+  {
+    value: 'database',
+    label: t('label.database'),
+  },
+  {
+    value: 'databaseSchema',
+    label: t('label.database-schema'),
+  },
+  {
+    value: 'testCase',
+    label: t('label.test-case'),
+  },
+  {
+    value: 'testSuite',
+    label: t('label.test-suite'),
+  },
+  {
+    value: 'chart',
+    label: t('label.chart'),
+  },
+  {
+    value: 'dashboardDataModel',
+    label: t('label.data-model'),
+  },
+  ...map(ServiceCategoryPlural, (key, value) => ({
+    value,
+    label: startCase(key),
+  })).filter(
+    ({ value }) => ['metadataService', 'storageService'].indexOf(value) === -1
+  ),
   {
     value: 'entityReportData',
     label: t('label.data-assets-report'),
@@ -65,33 +107,17 @@ export const ELASTIC_SEARCH_INDEX_ENTITIES = [
     value: 'webAnalyticUserActivityReportData',
     label: t('label.user-analytics-report'),
   },
-  {
-    value: 'container',
-    label: t('label.container'),
-  },
-  {
-    value: 'query',
-    label: t('label.query'),
-  },
-  {
-    value: 'testCase',
-    label: t('label.test-case'),
-  },
-  {
-    value: 'databaseSchema',
-    label: t('label.database-schema'),
-  },
   {
     value: 'domain',
     label: t('label.domain'),
   },
-  ...map(ServiceCategoryPlural, (key, value) => ({
-    value,
-    label: startCase(key),
-  })),
   {
-    value: 'chart',
-    label: 'Chart',
+    value: 'storedProcedure',
+    label: t('label.stored-procedure'),
+  },
+  {
+    value: 'dataProduct',
+    label: t('label.data-product'),
   },
 ];