diff --git a/repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java b/repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java
index 70d7369a44..0d5aca073e 100644
--- a/repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java
+++ b/repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java
@@ -176,10 +176,10 @@ public static JsonNode createQueryWithOperatorForTag(String operator, String att
                     return createDSLForTagKeyValue(attributeName, attributeValueNode);
                 }
             }
-            case POLICY_FILTER_CRITERIA_NOT_EQUALS -> {
+            case POLICY_FILTER_CRITERIA_NOT_EQUALS, POLICY_FILTER_CRITERIA_NOT_IN -> {
                 ObjectNode mustNotNode = queryNode.putObject("bool").putObject("must_not");
                 if (attributeValueNode.isArray()) {
-                    ArrayNode shouldArray = mustNotNode.putArray("should");
+                    ArrayNode shouldArray = mustNotNode.putObject("bool").putArray("should");
                     for (JsonNode valueNode : attributeValueNode) {
                         shouldArray.add(createDSLForTagKeyValue(attributeName, valueNode));
                     }
@@ -197,17 +197,6 @@ public static JsonNode createQueryWithOperatorForTag(String operator, String att
                     shouldArray.add(createDSLForTagKeyValue(attributeName, attributeValueNode));
                 }
             }
-            case POLICY_FILTER_CRITERIA_NOT_IN -> {
-                ObjectNode notInMustNot = queryNode.putObject("bool").putObject("must_not");
-                ArrayNode notInShouldArray = notInMustNot.putArray("should");
-                if (attributeValueNode.isArray()) {
-                    for (JsonNode valueNode : attributeValueNode) {
-                        notInShouldArray.add(createDSLForTagKeyValue(attributeName, valueNode));
-                    }
-                } else {
-                    notInShouldArray.add(createDSLForTagKeyValue(attributeName, attributeValueNode));
-                }
-            }
             default -> LOG.warn("Found unknown operator {}", operator);
         }
         return queryNode;