diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx
index cb1bd3c6e67..f6a1c8be52e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx
@@ -114,6 +114,7 @@ const FeedCardHeader: FC<FeedHeaderProp> = ({
       {t('message.made-announcement-for-entity', { entity: entityType })}{' '}
       <EntityPopOverCard entityFQN={entityFQN} entityType={entityType}>
         <Link
+          className="break-all"
           data-testid="entitylink"
           to={prepareFeedLink(entityType, entityFQN)}>
           {entityDisplayName(entityType, entityFQN)}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx
index 09784860cb4..7315e675a51 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx
@@ -254,9 +254,11 @@ export const DataAssetsHeader = ({
   };
 
   useEffect(() => {
-    if (dataAsset.fullyQualifiedName && !isTourPage && !excludeEntityService) {
+    if (dataAsset.fullyQualifiedName && !isTourPage) {
       fetchActiveAnnouncement();
-      fetchTaskCount();
+      if (!excludeEntityService) {
+        fetchTaskCount();
+      }
     }
     if (entityType === EntityType.CONTAINER) {
       const asset = dataAsset as Container;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.tsx
index 144393958a2..6048ee85d05 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.tsx
@@ -60,10 +60,11 @@ const AnnouncementDrawer: FC<Props> = ({
 
   const title = (
     <Space
+      align="start"
       className="justify-between"
       data-testid="title"
       style={{ width: '100%' }}>
-      <Typography.Text className="font-medium">
+      <Typography.Text className="font-medium break-all">
         {t('label.announcement-on-entity', { entity: entityName })}
       </Typography.Text>
       <CloseOutlined onClick={onClose} />
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AnnouncementsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AnnouncementsUtils.ts
index b43804553c1..121c8005043 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/AnnouncementsUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/AnnouncementsUtils.ts
@@ -19,7 +19,20 @@ export const ANNOUNCEMENT_ENTITIES = [
   EntityType.TOPIC,
   EntityType.PIPELINE,
   EntityType.MLMODEL,
+  EntityType.CONTAINER,
+  EntityType.DASHBOARD_DATA_MODEL,
+  EntityType.STORED_PROCEDURE,
   EntityType.SEARCH_INDEX,
+  EntityType.DATABASE,
+  EntityType.DATABASE_SCHEMA,
+  EntityType.DATABASE_SERVICE,
+  EntityType.MESSAGING_SERVICE,
+  EntityType.DASHBOARD_SERVICE,
+  EntityType.PIPELINE_SERVICE,
+  EntityType.MLMODEL_SERVICE,
+  EntityType.STORAGE_SERVICE,
+  EntityType.METADATA_SERVICE,
+  EntityType.SEARCH_SERVICE,
 ];
 
 export const isActiveAnnouncement = (startTime: number, endTime: number) => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
index 4c3f64ff65b..6942f3933a9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
@@ -570,6 +570,10 @@ export const entityDisplayName = (entityType: string, entityFQN: string) => {
       EntityType.DASHBOARD_SERVICE,
       EntityType.MESSAGING_SERVICE,
       EntityType.PIPELINE_SERVICE,
+      EntityType.MLMODEL_SERVICE,
+      EntityType.METADATA_SERVICE,
+      EntityType.STORAGE_SERVICE,
+      EntityType.SEARCH_SERVICE,
       EntityType.TYPE,
       EntityType.MLMODEL,
     ].includes(entityType as EntityType)
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx
index 1e4cc9d642c..cde91ae1b3d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx
@@ -242,6 +242,10 @@ export const getEntityLink = (
     case EntityType.DASHBOARD_SERVICE:
     case EntityType.MESSAGING_SERVICE:
     case EntityType.PIPELINE_SERVICE:
+    case EntityType.MLMODEL_SERVICE:
+    case EntityType.METADATA_SERVICE:
+    case EntityType.STORAGE_SERVICE:
+    case EntityType.SEARCH_SERVICE:
       return getServiceDetailsPath(fullyQualifiedName, `${indexType}s`);
 
     case EntityType.WEBHOOK: