diff --git a/core/es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java b/core/es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java
index 6dd189920..e7fd76e69 100644
--- a/core/es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java
+++ b/core/es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java
@@ -634,15 +634,7 @@ private static SearchSourceBuilder addAggregations(
           searchSourceBuilder.aggregation(
                   AggregationBuilders.terms(key).field(key + ElasticSearchHelper.RAW_APPEND));
         } else {
-          Predicate<String> doesNotRequireRaw = field ->
-                  field.equals("profileDetails.profileStatus") ||
-                          field.equals("profileDetails.additionalProperties.tag") ||
-                          field.equals("profileDetails.additionalProperties.webPortalLang") ||
-                          field.equals("profileDetails.employmentDetails.departmentName") ||
-                          field.equals("profileDetails.employmentDetails.employeeCode") ||
-                          field.equals("profileDetails.personalDetails.category") ||
-                          field.equals("profileDetails.personalDetails.domicileMedium") ||
-                          field.equals("profileDetails.personalDetails.gender");
+          Predicate<String> doesNotRequireRaw = field -> field.startsWith("profileDetails");
           for (Map<String, Object> groupByMap : facets) {
             String groupByParent = (String) groupByMap.get(key);
             if (!value.contains(".")) {