diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.test.tsx
index e37de5fea05a..f492090460d6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.test.tsx
@@ -114,4 +114,20 @@ describe('getTagAssetsQueryFilter', () => {
 
     expect(result).toEqual(queryFilter);
   });
+
+  it('returns common query filter when classification name ends with "Tier"', () => {
+    const tagFQN = 'DataTier.Bronze';
+    const result = getTagAssetsQueryFilter(tagFQN);
+    const queryFilter = getTermQuery({ 'tags.tagFQN': tagFQN });
+
+    expect(result).toEqual(queryFilter);
+  });
+
+  it('returns common query filter when classification name ends with "Certification"', () => {
+    const tagFQN = 'DataCertification.Gold';
+    const result = getTagAssetsQueryFilter(tagFQN);
+    const queryFilter = getTermQuery({ 'tags.tagFQN': tagFQN });
+
+    expect(result).toEqual(queryFilter);
+  });
 });
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx
index 4d98d9e34320..c91b413d53ab 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx
@@ -597,9 +597,9 @@ export const getExcludedIndexesBasedOnEntityTypeEditTagPermission = (
 export const getTagAssetsQueryFilter = (fqn: string) => {
   let fieldName = 'tags.tagFQN';
 
-  if (fqn.includes('Tier.')) {
+  if (fqn.startsWith(`Tier${FQN_SEPARATOR_CHAR}`)) {
     fieldName = 'tier.tagFQN';
-  } else if (fqn.includes('Certification.')) {
+  } else if (fqn.startsWith(`Certification${FQN_SEPARATOR_CHAR}`)) {
     fieldName = 'certification.tagLabel.tagFQN';
   }