diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActions.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActions.interface.ts
index 075361568ee..75a56df992d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActions.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActions.interface.ts
@@ -24,7 +24,7 @@ export interface PipelineActionsProps {
   serviceName?: string;
   deployIngestion?: (id: string, displayName: string) => Promise<void>;
   triggerIngestion?: (id: string, displayName: string) => Promise<void>;
-  handleDeleteSelection: (row: SelectedRowDetails) => void;
+  handleDeleteSelection?: (row: SelectedRowDetails) => void;
   handleEditClick?: (fqn: string) => void;
   handleEnableDisableIngestion?: (id: string) => Promise<void>;
   handleIsConfirmationModalOpen: (value: boolean) => void;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActionsDropdown.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActionsDropdown.interface.ts
index b38d19a6ba8..d860ae28297 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActionsDropdown.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActionsDropdown.interface.ts
@@ -24,7 +24,7 @@ export interface PipelineActionsDropdownProps {
   deployIngestion?: (id: string, displayName: string) => Promise<void>;
   handleEditClick: ((fqn: string) => void) | undefined;
   ingestionPipelinePermissions?: IngestionServicePermission;
-  handleDeleteSelection: (row: SelectedRowDetails) => void;
+  handleDeleteSelection?: (row: SelectedRowDetails) => void;
   handleIsConfirmationModalOpen: (value: boolean) => void;
   onIngestionWorkflowsUpdate?: () => void;
   moreActionButtonProps?: ButtonProps;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActionsDropdown.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActionsDropdown.tsx
index a6b5db9165e..105b33d11b7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActionsDropdown.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/PipelineActions/PipelineActionsDropdown.tsx
@@ -136,7 +136,7 @@ function PipelineActionsDropdown({
 
   const handleConfirmDelete = useCallback(
     (id: string, name: string, displayName?: string) => {
-      handleDeleteSelection({
+      handleDeleteSelection?.({
         id,
         name,
         displayName,
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.test.ts
index 537fdc377d6..63ff757b863 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.test.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.test.ts
@@ -148,7 +148,10 @@ describe('getEntitySpecificQueryBuilderFields', () => {
       SearchIndex.GLOSSARY_TERM,
     ]);
 
-    expect(Object.keys(result)).toEqual([EntityFields.GLOSSARY_TERM_STATUS]);
+    expect(Object.keys(result)).toEqual([
+      EntityFields.GLOSSARY_TERM_STATUS,
+      EntityFields.GLOSSARY,
+    ]);
   });
 
   it('should return databaseSchema specific fields', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
index 12ed537d1c2..6afe1cdcef3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
@@ -337,7 +337,7 @@ class AdvancedSearchClassBase {
   /**
    * Fields specific to Glossary
    */
-  glossaryQueryBuilderFields: Fields = {
+  glossaryTermQueryBuilderFields: Fields = {
     [EntityFields.GLOSSARY_TERM_STATUS]: {
       label: t('label.status'),
       type: 'select',
@@ -350,6 +350,18 @@ class AdvancedSearchClassBase {
         useAsyncSearch: true,
       },
     },
+    [EntityFields.GLOSSARY]: {
+      label: t('label.glossary'),
+      type: 'select',
+      mainWidgetProps: this.mainWidgetProps,
+      fieldSettings: {
+        asyncFetch: this.autocomplete({
+          searchIndex: SearchIndex.GLOSSARY_TERM,
+          entityField: EntityFields.GLOSSARY,
+        }),
+        useAsyncSearch: true,
+      },
+    },
   };
 
   /**
@@ -742,7 +754,7 @@ class AdvancedSearchClassBase {
       [SearchIndex.SEARCH_INDEX]: this.searchIndexQueryBuilderFields,
       [SearchIndex.DASHBOARD_DATA_MODEL]: this.dataModelQueryBuilderFields,
       [SearchIndex.API_ENDPOINT_INDEX]: this.apiEndpointQueryBuilderFields,
-      [SearchIndex.GLOSSARY_TERM]: this.glossaryQueryBuilderFields,
+      [SearchIndex.GLOSSARY_TERM]: this.glossaryTermQueryBuilderFields,
       [SearchIndex.DATABASE_SCHEMA]: this.databaseSchemaQueryBuilderFields,
       [SearchIndex.STORED_PROCEDURE]: this.storedProcedureQueryBuilderFields,
       [SearchIndex.ALL]: {
@@ -766,7 +778,7 @@ class AdvancedSearchClassBase {
         ...this.searchIndexQueryBuilderFields,
         ...this.dataModelQueryBuilderFields,
         ...this.apiEndpointQueryBuilderFields,
-        ...this.glossaryQueryBuilderFields,
+        ...this.glossaryTermQueryBuilderFields,
       },
     };
 
@@ -866,6 +878,8 @@ class AdvancedSearchClassBase {
       SearchIndex.API_SERVICE_INDEX,
       SearchIndex.API_ENDPOINT_INDEX,
       SearchIndex.API_COLLECTION_INDEX,
+      SearchIndex.DASHBOARD_DATA_MODEL,
+      SearchIndex.STORED_PROCEDURE,
     ];
 
     const shouldAddServiceField =
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
index 595e5ca6a1d..9b4dd9aefa8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
@@ -2499,6 +2499,9 @@ export const getEntityNameLabel = (entityName?: string) => {
     query: t('label.query'),
     THREAD: t('label.thread'),
     app: t('label.application'),
+    apiCollection: t('label.api-collection'),
+    apiEndpoint: t('label.api-endpoint'),
+    metric: t('label.metric'),
   };
 
   return (