diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/security/RBACConditionEvaluator.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/security/RBACConditionEvaluator.java index ac319e8cf9b..f2f66a008e9 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/security/RBACConditionEvaluator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/security/RBACConditionEvaluator.java @@ -235,7 +235,12 @@ public class RBACConditionEvaluator { public void matchAnyTag(List tags, ConditionCollector collector) { List tagQueries = new ArrayList<>(); for (String tag : tags) { - OMQueryBuilder tagQuery = queryBuilderFactory.termQuery("tags.tagFQN", tag); + OMQueryBuilder tagQuery; + if (tag.startsWith("Tier")) { + tagQuery = queryBuilderFactory.termQuery("tier.tagFQN", tag); + } else { + tagQuery = queryBuilderFactory.termQuery("tags.tagFQN", tag); + } tagQueries.add(tagQuery); } OMQueryBuilder tagQueryCombined;