diff --git a/buildSrc/src/main/java/io/datahubproject/OpenApiEntities.java b/buildSrc/src/main/java/io/datahubproject/OpenApiEntities.java
index ed94a7d5db113..04cbadcdc6b7b 100644
--- a/buildSrc/src/main/java/io/datahubproject/OpenApiEntities.java
+++ b/buildSrc/src/main/java/io/datahubproject/OpenApiEntities.java
@@ -122,6 +122,14 @@ public ObjectNode entityExtension(List<ObjectNode> nodesList, ObjectNode schemas
         return componentsNode;
     }
 
+    /**
+     * Convert the pdl model names to desired class names. Upper case first letter unless the 3rd character is upper case.
+     * i.e. mlModel -> MLModel
+     *      dataset -> Dataset
+     *      dataProduct -> DataProduct
+     * @param s input string
+     * @return class name
+     */
     public static String toUpperFirst(String s) {
         if (s.length() > 2 && s.substring(2, 3).equals(s.substring(2, 3).toUpperCase())) {
             return s.substring(0, 2).toUpperCase() + s.substring(2);
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
index 242300b608833..aa854149de43a 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
@@ -289,44 +289,42 @@ public static void buildSortOrder(
     if (sortCriterion.isEmpty() && enableDefaultSort) {
       searchSourceBuilder.sort(new ScoreSortBuilder().order(SortOrder.DESC));
     } else {
-      sortCriterion.forEach(
-          sortCriteria -> {
-            Optional<SearchableAnnotation.FieldType> fieldTypeForDefault = Optional.empty();
-            for (EntitySpec entitySpec : entitySpecs) {
-              List<SearchableFieldSpec> fieldSpecs = entitySpec.getSearchableFieldSpecs();
-              for (SearchableFieldSpec fieldSpec : fieldSpecs) {
-                SearchableAnnotation annotation = fieldSpec.getSearchableAnnotation();
-                if (annotation.getFieldName().equals(sortCriteria.getField())
-                    || annotation.getFieldNameAliases().contains(sortCriteria.getField())) {
-                  fieldTypeForDefault =
-                      Optional.of(fieldSpec.getSearchableAnnotation().getFieldType());
-                  break;
-                }
-              }
-              if (fieldTypeForDefault.isPresent()) {
-                break;
-              }
-            }
-            if (fieldTypeForDefault.isEmpty()) {
-              log.warn(
-                  "Sort criterion field "
-                      + sortCriteria.getField()
-                      + " was not found in any entity spec to be searched");
-            }
-            final SortOrder esSortOrder =
-                (sortCriteria.getOrder() == com.linkedin.metadata.query.filter.SortOrder.ASCENDING)
-                    ? SortOrder.ASC
-                    : SortOrder.DESC;
-            FieldSortBuilder sortBuilder =
-                new FieldSortBuilder(sortCriteria.getField()).order(esSortOrder);
-            if (fieldTypeForDefault.isPresent()) {
-              String esFieldtype = getElasticTypeForFieldType(fieldTypeForDefault.get());
-              if (esFieldtype != null) {
-                sortBuilder.unmappedType(esFieldtype);
-              }
+      for (SortCriterion sortCriteria : sortCriterion) {
+        Optional<SearchableAnnotation.FieldType> fieldTypeForDefault = Optional.empty();
+        for (EntitySpec entitySpec : entitySpecs) {
+          List<SearchableFieldSpec> fieldSpecs = entitySpec.getSearchableFieldSpecs();
+          for (SearchableFieldSpec fieldSpec : fieldSpecs) {
+            SearchableAnnotation annotation = fieldSpec.getSearchableAnnotation();
+            if (annotation.getFieldName().equals(sortCriteria.getField())
+                || annotation.getFieldNameAliases().contains(sortCriteria.getField())) {
+              fieldTypeForDefault = Optional.of(fieldSpec.getSearchableAnnotation().getFieldType());
+              break;
             }
-            searchSourceBuilder.sort(sortBuilder);
-          });
+          }
+          if (fieldTypeForDefault.isPresent()) {
+            break;
+          }
+        }
+        if (fieldTypeForDefault.isEmpty()) {
+          log.warn(
+              "Sort criterion field "
+                  + sortCriteria.getField()
+                  + " was not found in any entity spec to be searched");
+        }
+        final SortOrder esSortOrder =
+            (sortCriteria.getOrder() == com.linkedin.metadata.query.filter.SortOrder.ASCENDING)
+                ? SortOrder.ASC
+                : SortOrder.DESC;
+        FieldSortBuilder sortBuilder =
+            new FieldSortBuilder(sortCriteria.getField()).order(esSortOrder);
+        if (fieldTypeForDefault.isPresent()) {
+          String esFieldtype = getElasticTypeForFieldType(fieldTypeForDefault.get());
+          if (esFieldtype != null) {
+            sortBuilder.unmappedType(esFieldtype);
+          }
+        }
+        searchSourceBuilder.sort(sortBuilder);
+      }
     }
     if (enableDefaultSort
         && (sortCriterion.isEmpty()
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/ReflectionCache.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/ReflectionCache.java
index 8c5d4681c4519..6c0474dc6cfb6 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/ReflectionCache.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/ReflectionCache.java
@@ -134,6 +134,14 @@ public Method lookupMethod(
     return lookupMethod(builderPair.getFirst(), method, parameters);
   }
 
+  /**
+   * Convert class name to the pdl model names. Upper case first letter unless the 3rd character is
+   * upper case. Reverse of {link ReflectionCache.toUpperFirst} i.e. MLModel -> mlModel Dataset ->
+   * dataset DataProduct -> dataProduct
+   *
+   * @param s input string
+   * @return class name
+   */
   public static String toLowerFirst(String s) {
     if (s.length() > 2 && s.substring(2, 3).equals(s.substring(2, 3).toUpperCase())) {
       return s.substring(0, 2).toLowerCase() + s.substring(2);
@@ -142,6 +150,13 @@ public static String toLowerFirst(String s) {
     }
   }
 
+  /**
+   * Convert the pdl model names to desired class names. Upper case first letter unless the 3rd
+   * character is upper case. i.e. mlModel -> MLModel dataset -> Dataset dataProduct -> DataProduct
+   *
+   * @param s input string
+   * @return class name
+   */
   public static String toUpperFirst(String s) {
     if (s.length() > 2 && s.substring(2, 3).equals(s.substring(2, 3).toUpperCase())) {
       return s.substring(0, 2).toUpperCase() + s.substring(2);
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
index d512a0d9501c6..503330fdc8a2e 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
@@ -409,7 +409,7 @@ private List<GenericEntity> toRecordTemplates(
   }
 
   private Boolean exists(Urn urn, @Nullable String aspect) {
-    return aspect == null ? entityService.exists(urn) : entityService.exists(urn, aspect);
+    return aspect == null ? entityService.exists(urn, true) : entityService.exists(urn, aspect);
   }
 
   private List<GenericEntity> toRecordTemplates(