diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1New.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1New.component.tsx
index 42f25afc8b6..1d1e1056121 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1New.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1New.component.tsx
@@ -116,7 +116,7 @@ const ActivityFeedListV1New = ({
     return <Loader />;
   }
 
-  if (isEmpty(entityThread) && !isLoading) {
+  if (isEmpty(entityThread) && isEmpty(feedList) && !isLoading) {
     return (
       <div
         className="p-x-md no-data-placeholder-container"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.component.tsx
index 385126e9801..9bad9a7a2a2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.component.tsx
@@ -14,6 +14,7 @@
 import classNames from 'classnames';
 import { lowerCase } from 'lodash';
 import React from 'react';
+import { TAG_LIST_SIZE } from '../../../constants/constants';
 import { EntityField } from '../../../constants/Feeds.constants';
 import EntityTasks from '../../../pages/TasksPage/EntityTasks/EntityTasks.component';
 import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
@@ -52,6 +53,7 @@ const TableTags = <T extends TableUnion>({
           selectedTags={tags}
           showHeader={false}
           showInlineEditButton={showInlineEditTagButton}
+          sizeCap={TAG_LIST_SIZE}
           tagType={type}
           onSelectionChange={async (selectedTags) => {
             await handleTagSelection(selectedTags, record);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/TagsViewer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/TagsViewer.tsx
index ce2e43ead38..e58c708e559 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/TagsViewer.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/TagsViewer.tsx
@@ -91,7 +91,7 @@ const TagsViewer: FunctionComponent<TagsViewerProps> = ({
   const popoverRenderElement = useMemo(
     () =>
       sortedTagsBySource.slice(sizeCap).length > 0 && (
-        <div className="m-t-xs" data-testid="popover-element">
+        <div className="m-t-xss" data-testid="popover-element">
           <Popover
             content={
               <div className="d-flex flex-column flex-wrap gap-2">
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
index d48435bb085..2b6d83e2e15 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
@@ -55,6 +55,7 @@ export const PAGE_SIZE_LARGE = 50;
 export const ES_MAX_PAGE_SIZE = 10000;
 export const API_RES_MAX_SIZE = 100000;
 export const LIST_SIZE = 5;
+export const TAG_LIST_SIZE = 3;
 export const ADD_USER_CONTAINER_HEIGHT = 250;
 export const INGESTION_PROGRESS_START_VAL = 20;
 export const INGESTION_PROGRESS_END_VAL = 80;
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TourUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TourUtils.tsx
index dc302023506..5a02175f5a5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TourUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TourUtils.tsx
@@ -228,7 +228,7 @@ export const getTourSteps = ({
           i18nKey="message.tour-step-click-on-entity-tab"
           renderElement={<strong />}
           values={{
-            text: i18next.t('label.profiler'),
+            text: i18next.t('label.data-obervability'),
           }}
         />
       </p>