diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataAssetRulesDisabled.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataAssetRulesDisabled.spec.ts
index 733c0949d020..28185212b612 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataAssetRulesDisabled.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataAssetRulesDisabled.spec.ts
@@ -196,9 +196,9 @@ test.describe(
         ).toBeVisible();
 
         await page
-          .getByTestId('select-owner-tabs')
+          .getByRole('tabpanel', { name: /Users/ })
           .getByTestId('loader')
-          .waitFor({ state: 'detached' });
+          .waitFor({ state: 'hidden' });
 
         await page
           .locator("[data-testid='select-owner-tabs']")
@@ -206,9 +206,9 @@ test.describe(
           .click();
 
         await page
-          .getByTestId('select-owner-tabs')
+          .getByRole('tabpanel', { name: 'Teams' })
           .getByTestId('loader')
-          .waitFor({ state: 'detached' });
+          .waitFor({ state: 'hidden' });
 
         const teamsSearchBar = page.getByTestId(
           'owner-select-teams-search-bar'
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/common.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/common.ts
index fb1e2e35c7e8..1d6c664c84ec 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/common.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/common.ts
@@ -245,9 +245,16 @@ export const assignDomain = async (
   await waitForAllLoadersToDisappear(page);
 
   if (checkSelectedDomain) {
-    await expect(page.getByTestId('domain-link')).toContainText(
-      domain.displayName
-    );
+    const hasMultipleDomains = await page
+      .getByTestId('domain-count-button')
+      .isVisible();
+    if (hasMultipleDomains) {
+      await expect(page.getByTestId('domain-count-button')).toBeVisible();
+    } else {
+      await expect(page.getByTestId('domain-link')).toContainText(
+        domain.displayName
+      );
+    }
   }
 };
 
@@ -422,9 +429,17 @@ export const assignDataProduct = async (
   action: 'Add' | 'Edit' = 'Add',
   parentId = 'KnowledgePanel.DataProducts'
 ) => {
-  await expect(page.getByTestId('domain-link')).toContainText(
-    domain.displayName
-  );
+  const hasMultipleDomains = await page
+    .getByTestId('domain-count-button')
+    .isVisible();
+  if (hasMultipleDomains) {
+    await expect(page.getByTestId('domain-count-button')).toBeVisible();
+  } else {
+    await expect(page.getByTestId('domain-link')).toContainText(
+      domain.displayName
+    );
+  }
+
   await page
     .getByTestId(parentId)
     .getByTestId('data-products-container')
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySelectableList/EntitySelectableList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySelectableList/EntitySelectableList.component.tsx
index c6369586e7c7..31f74e8a3194 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySelectableList/EntitySelectableList.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySelectableList/EntitySelectableList.component.tsx
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 import { Popover } from 'antd';
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { ADD_USER_CONTAINER_HEIGHT } from '../../../constants/constants';
 import { EntityReference } from '../../../generated/entity/data/table';
 import { FocusTrapWithContainer } from '../FocusTrap/FocusTrapWithContainer';
@@ -30,6 +30,11 @@ export const EntitySelectableList = <T,>({
 }: EntitySelectableListProps<T>) => {
   const [popupVisible, setPopupVisible] = useState(false);
 
+  const selectedItemsAsEntityReferences = useMemo(
+    () => config.toEntityReference(selectedItems),
+    [selectedItems, config.toEntityReference]
+  );
+
   const handleUpdate = async (updateItems: EntityReference[]) => {
     const convertedItems = config.fromEntityReference(updateItems);
     await onUpdate(convertedItems);
@@ -49,7 +54,7 @@ export const EntitySelectableList = <T,>({
               multiSelect={multiSelect}
               searchBarDataTestId={config.searchBarDataTestId}
               searchPlaceholder={config.searchPlaceholder}
-              selectedItems={config.toEntityReference(selectedItems)}
+              selectedItems={selectedItemsAsEntityReferences}
               onCancel={onCancel}
               onUpdate={handleUpdate}
             />