diff --git a/document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/vistors/PostgresSelectTypeExpressionVisitor.java b/document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/vistors/PostgresSelectTypeExpressionVisitor.java
index 600fc1f7..ae1cf863 100644
--- a/document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/vistors/PostgresSelectTypeExpressionVisitor.java
+++ b/document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/vistors/PostgresSelectTypeExpressionVisitor.java
@@ -112,10 +112,11 @@ public static String getSelections(PostgresQueryParser postgresQueryParser) {
   private static String getAlias(
       SelectionSpec selectionSpec,
       PostgresIdentifierExpressionVisitor identifierExpressionVisitor) {
-    return !StringUtils.isEmpty(selectionSpec.getAlias())
-        ? PostgresUtils.wrapAliasWithDoubleQuotes(selectionSpec.getAlias())
-        : PostgresUtils.encodeAliasForNestedField(
-            selectionSpec.getExpression().accept(identifierExpressionVisitor));
+    return PostgresUtils.wrapAliasWithDoubleQuotes(
+        !StringUtils.isEmpty(selectionSpec.getAlias())
+            ? selectionSpec.getAlias()
+            : PostgresUtils.encodeAliasForNestedField(
+                selectionSpec.getExpression().accept(identifierExpressionVisitor)));
   }
 
   private static void memorizedSelectionForUserDefinedAlias(
diff --git a/document-store/src/test/java/org/hypertrace/core/documentstore/postgres/PostgresCollectionTest.java b/document-store/src/test/java/org/hypertrace/core/documentstore/postgres/PostgresCollectionTest.java
index a7d251f9..494af419 100644
--- a/document-store/src/test/java/org/hypertrace/core/documentstore/postgres/PostgresCollectionTest.java
+++ b/document-store/src/test/java/org/hypertrace/core/documentstore/postgres/PostgresCollectionTest.java
@@ -88,10 +88,10 @@ void testUpdateAtomicWithFilter() throws IOException, SQLException {
     final String selectQuery =
         String.format(
             "SELECT "
-                + "document->'quantity' AS quantity, "
-                + "document->'price' AS price, "
-                + "document->'date' AS date, "
-                + "document->'props' AS props, "
+                + "document->'quantity' AS \"quantity\", "
+                + "document->'price' AS \"price\", "
+                + "document->'date' AS \"date\", "
+                + "document->'props' AS \"props\", "
                 + "id AS _implicit_id "
                 + "FROM %s "
                 + "WHERE (document->>'item' = ?) "
@@ -188,10 +188,10 @@ void testUpdateAtomicWithFilter_getNone() throws IOException, SQLException {
     final String selectQuery =
         String.format(
             "SELECT "
-                + "document->'quantity' AS quantity, "
-                + "document->'price' AS price, "
-                + "document->'date' AS date, "
-                + "document->'props' AS props, "
+                + "document->'quantity' AS \"quantity\", "
+                + "document->'price' AS \"price\", "
+                + "document->'date' AS \"date\", "
+                + "document->'props' AS \"props\", "
                 + "id AS _implicit_id "
                 + "FROM %s "
                 + "WHERE (document->>'item' = ?) "
@@ -284,10 +284,10 @@ void testUpdateAtomicWithFilter_emptyResults() throws IOException, SQLException
     final String selectQuery =
         String.format(
             "SELECT "
-                + "document->'quantity' AS quantity, "
-                + "document->'price' AS price, "
-                + "document->'date' AS date, "
-                + "document->'props' AS props, "
+                + "document->'quantity' AS \"quantity\", "
+                + "document->'price' AS \"price\", "
+                + "document->'date' AS \"date\", "
+                + "document->'props' AS \"props\", "
                 + "id AS _implicit_id "
                 + "FROM %s "
                 + "WHERE (document->>'item' = ?) "
@@ -334,10 +334,10 @@ void testUpdateAtomicWithFilter_throwsException() throws Exception {
     final String selectQuery =
         String.format(
             "SELECT "
-                + "document->'quantity' AS quantity, "
-                + "document->'price' AS price, "
-                + "document->'date' AS date, "
-                + "document->'props' AS props, "
+                + "document->'quantity' AS \"quantity\", "
+                + "document->'price' AS \"price\", "
+                + "document->'date' AS \"date\", "
+                + "document->'props' AS \"props\", "
                 + "id AS _implicit_id "
                 + "FROM %s "
                 + "WHERE (document->>'item' = ?) "
@@ -439,10 +439,10 @@ void testUpdateBulkWithFilter() throws IOException, SQLException {
     final String selectQuery =
         String.format(
             "SELECT "
-                + "document->'quantity' AS quantity, "
-                + "document->'price' AS price, "
-                + "document->'date' AS date, "
-                + "document->'props' AS props "
+                + "document->'quantity' AS \"quantity\", "
+                + "document->'price' AS \"price\", "
+                + "document->'date' AS \"date\", "
+                + "document->'props' AS \"props\" "
                 + "FROM %s "
                 + "WHERE (document->>'item' = ?) "
                 + "AND (document->>'date' < ?) "
@@ -608,10 +608,10 @@ void testUpdateBulkWithFilter_emptyResults() throws IOException, SQLException {
     final String selectQuery =
         String.format(
             "SELECT "
-                + "document->'quantity' AS quantity, "
-                + "document->'price' AS price, "
-                + "document->'date' AS date, "
-                + "document->'props' AS props "
+                + "document->'quantity' AS \"quantity\", "
+                + "document->'price' AS \"price\", "
+                + "document->'date' AS \"date\", "
+                + "document->'props' AS \"props\" "
                 + "FROM %s "
                 + "WHERE (document->>'item' = ?) "
                 + "AND (document->>'date' < ?) "
@@ -701,10 +701,10 @@ void testUpdateBulkWithFilter_throwsExceptionBeforeUpdate() throws IOException,
     final String selectQuery =
         String.format(
             "SELECT "
-                + "document->'quantity' AS quantity, "
-                + "document->'price' AS price, "
-                + "document->'date' AS date, "
-                + "document->'props' AS props "
+                + "document->'quantity' AS \"quantity\", "
+                + "document->'price' AS \"price\", "
+                + "document->'date' AS \"date\", "
+                + "document->'props' AS \"props\" "
                 + "FROM %s "
                 + "WHERE (document->>'item' = ?) "
                 + "AND (document->>'date' < ?) "
@@ -740,10 +740,10 @@ void testUpdateBulkWithFilter_throwsExceptionAfterUpdate() throws IOException, S
     final String selectQuery =
         String.format(
             "SELECT "
-                + "document->'quantity' AS quantity, "
-                + "document->'price' AS price, "
-                + "document->'date' AS date, "
-                + "document->'props' AS props "
+                + "document->'quantity' AS \"quantity\", "
+                + "document->'price' AS \"price\", "
+                + "document->'date' AS \"date\", "
+                + "document->'props' AS \"props\" "
                 + "FROM %s "
                 + "WHERE (document->>'item' = ?) "
                 + "AND (document->>'date' < ?) "
diff --git a/document-store/src/test/java/org/hypertrace/core/documentstore/postgres/query/v1/PostgresQueryParserTest.java b/document-store/src/test/java/org/hypertrace/core/documentstore/postgres/query/v1/PostgresQueryParserTest.java
index 159f890c..ced22ad0 100644
--- a/document-store/src/test/java/org/hypertrace/core/documentstore/postgres/query/v1/PostgresQueryParserTest.java
+++ b/document-store/src/test/java/org/hypertrace/core/documentstore/postgres/query/v1/PostgresQueryParserTest.java
@@ -219,7 +219,8 @@ void testBasicSelectionExpression() {
         new PostgresQueryParser(TEST_COLLECTION, PostgresQueryTransformer.transform(query));
     String sql = postgresQueryParser.parse();
     assertEquals(
-        "SELECT document->'item' AS item, document->'price' AS price " + "FROM testCollection",
+        "SELECT document->'item' AS \"item\", document->'price' AS \"price\" "
+            + "FROM testCollection",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
@@ -243,7 +244,7 @@ void testFunctionalSelectionExpression() {
         new PostgresQueryParser(TEST_COLLECTION, PostgresQueryTransformer.transform(query));
     String sql = postgresQueryParser.parse();
     assertEquals(
-        "SELECT document->'item' AS item, "
+        "SELECT document->'item' AS \"item\", "
             + "CAST (document->>'price' AS NUMERIC) * CAST (document->>'quantity' AS NUMERIC) AS \"total\" "
             + "FROM testCollection",
         sql);
@@ -271,9 +272,9 @@ void testFunctionalSelectionExpressionWithNestedField() {
         new PostgresQueryParser(TEST_COLLECTION, PostgresQueryTransformer.transform(query));
     String sql = postgresQueryParser.parse();
     assertEquals(
-        "SELECT document->'item' AS item, "
-            + "document->'props'->'brand' AS props_dot_brand, "
-            + "document->'props'->'seller'->'name' AS props_dot_seller_dot_name, "
+        "SELECT document->'item' AS \"item\", "
+            + "document->'props'->'brand' AS \"props_dot_brand\", "
+            + "document->'props'->'seller'->'name' AS \"props_dot_seller_dot_name\", "
             + "CAST (document->>'price' AS NUMERIC) * CAST (document->>'quantity' AS NUMERIC) AS \"total\" "
             + "FROM testCollection",
         sql);
@@ -301,7 +302,7 @@ void testFunctionalSelectionExpressionWithNestedFieldWithAlias() {
         new PostgresQueryParser(TEST_COLLECTION, PostgresQueryTransformer.transform(query));
     String sql = postgresQueryParser.parse();
     assertEquals(
-        "SELECT document->'item' AS item, "
+        "SELECT document->'item' AS \"item\", "
             + "document->'props'->'brand' AS \"props_band\", "
             + "document->'props'->'seller'->'name' AS \"props_seller_name\", "
             + "CAST (document->>'price' AS NUMERIC) * CAST (document->>'quantity' AS NUMERIC) AS \"total\" "
@@ -340,7 +341,7 @@ void testAggregationExpression() {
         new PostgresQueryParser(TEST_COLLECTION, PostgresQueryTransformer.transform(query));
     String sql = postgresQueryParser.parse();
     assertEquals(
-        "SELECT document->'item' AS item, "
+        "SELECT document->'item' AS \"item\", "
             + "AVG( CAST (document->>'quantity' AS NUMERIC) ) AS \"qty_avg\", "
             + "COUNT( document->>'quantity' ) AS \"qty_count\", "
             + "COUNT(DISTINCT document->>'quantity' ) AS \"qty_distinct_count\", "
@@ -419,7 +420,7 @@ void testAggregateWithMultipleGroupingLevels() {
     String sql = postgresQueryParser.parse();
 
     assertEquals(
-        "SELECT document->'item' AS item, document->'price' AS price, "
+        "SELECT document->'item' AS \"item\", document->'price' AS \"price\", "
             + "ARRAY_AGG(DISTINCT CAST (document->>'quantity' AS NUMERIC)) AS \"quantities\", "
             + "ARRAY_LENGTH( ARRAY_AGG(DISTINCT CAST (document->>'quantity' AS NUMERIC)), 1 ) AS \"num_quantities\" "
             + "FROM testCollection "
@@ -452,7 +453,7 @@ void testAggregationFilter() {
 
     assertEquals(
         "SELECT COUNT(DISTINCT document->>'quantity' ) AS \"qty_count\", "
-            + "document->'item' AS item "
+            + "document->'item' AS \"item\" "
             + "FROM testCollection "
             + "GROUP BY document->'item' "
             + "HAVING COUNT(DISTINCT document->>'quantity' ) <= ?",
@@ -485,7 +486,7 @@ void testAggregationFilterAndWhereFilter() {
 
     assertEquals(
         "SELECT COUNT(DISTINCT document->>'quantity' ) AS \"qty_count\", "
-            + "document->'item' AS item "
+            + "document->'item' AS \"item\" "
             + "FROM testCollection "
             + "WHERE CAST (document->>'price' AS NUMERIC) <= ? "
             + "GROUP BY document->'item' "
@@ -526,8 +527,8 @@ void testAggregationFilterAlongWithNonAliasFields() {
 
     assertEquals(
         "SELECT COUNT(DISTINCT document->>'quantity' ) AS \"qty_count\", "
-            + "document->'item' AS item, "
-            + "document->'price' AS price "
+            + "document->'item' AS \"item\", "
+            + "document->'price' AS \"price\" "
             + "FROM testCollection "
             + "GROUP BY document->'item',document->'price' "
             + "HAVING (COUNT(DISTINCT document->>'quantity' ) <= ?) AND (CAST (document->'price' AS NUMERIC) > ?)",
@@ -554,7 +555,7 @@ void testSimpleOrderByClause() {
     String sql = postgresQueryParser.parse();
 
     assertEquals(
-        "SELECT document->'item' AS item, document->'price' AS price "
+        "SELECT document->'item' AS \"item\", document->'price' AS \"price\" "
             + "FROM testCollection "
             + "ORDER BY document->'price' ASC NULLS FIRST,document->'item' DESC NULLS LAST",
         sql);
@@ -585,7 +586,7 @@ void testOrderByClauseWithAlias() {
 
     assertEquals(
         "SELECT COUNT(DISTINCT document->>'quantity' ) AS \"qty_count\", "
-            + "document->'item' AS item "
+            + "document->'item' AS \"item\" "
             + "FROM testCollection "
             + "GROUP BY document->'item' "
             + "HAVING COUNT(DISTINCT document->>'quantity' ) <= ? "
@@ -637,10 +638,10 @@ void testFindWithSortingAndPagination() {
     String sql = postgresQueryParser.parse();
 
     assertEquals(
-        "SELECT document->'item' AS item, "
-            + "document->'price' AS price, "
-            + "document->'quantity' AS quantity, "
-            + "document->'date' AS date "
+        "SELECT document->'item' AS \"item\", "
+            + "document->'price' AS \"price\", "
+            + "document->'quantity' AS \"quantity\", "
+            + "document->'date' AS \"date\" "
             + "FROM testCollection "
             + "WHERE document->>'item' IN (?, ?, ?, ?) "
             + "ORDER BY document->'quantity' DESC NULLS LAST,document->'item' ASC NULLS FIRST "
@@ -678,10 +679,10 @@ void testUnnestWithoutPreserveNullAndEmptyArrays() {
             + "table0 as (SELECT * from testCollection),\n"
             + "table1 as (SELECT * from table0 t0, jsonb_array_elements(document->'sales') p1(sales)),\n"
             + "table2 as (SELECT * from table1 t1, jsonb_array_elements(sales->'medium') p2(sales_dot_medium))\n"
-            + "SELECT document->'item' AS item, "
-            + "document->'price' AS price, "
-            + "sales->'city' AS sales_dot_city, "
-            + "sales_dot_medium->'type' AS sales_dot_medium_dot_type "
+            + "SELECT document->'item' AS \"item\", "
+            + "document->'price' AS \"price\", "
+            + "sales->'city' AS \"sales_dot_city\", "
+            + "sales_dot_medium->'type' AS \"sales_dot_medium_dot_type\" "
             + "FROM table2",
         sql);
 
@@ -710,10 +711,10 @@ void testUnnestWithPreserveNullAndEmptyArrays() {
             + "table0 as (SELECT * from testCollection),\n"
             + "table1 as (SELECT * from table0 t0 LEFT JOIN LATERAL jsonb_array_elements(document->'sales') p1(sales) on TRUE),\n"
             + "table2 as (SELECT * from table1 t1 LEFT JOIN LATERAL jsonb_array_elements(sales->'medium') p2(sales_dot_medium) on TRUE)\n"
-            + "SELECT document->'item' AS item, "
-            + "document->'price' AS price, "
-            + "sales->'city' AS sales_dot_city, "
-            + "sales_dot_medium->'type' AS sales_dot_medium_dot_type "
+            + "SELECT document->'item' AS \"item\", "
+            + "document->'price' AS \"price\", "
+            + "sales->'city' AS \"sales_dot_city\", "
+            + "sales_dot_medium->'type' AS \"sales_dot_medium_dot_type\" "
             + "FROM table2",
         sql);
 
@@ -754,9 +755,9 @@ void testUnnestWithoutPreserveNullAndEmptyArraysWithFilters() {
             + "WHERE CAST (document->>'quantity' AS NUMERIC) != ?),\n"
             + "table1 as (SELECT * from table0 t0, jsonb_array_elements(document->'sales') p1(sales)),\n"
             + "table2 as (SELECT * from table1 t1, jsonb_array_elements(sales->'medium') p2(sales_dot_medium))\n"
-            + "SELECT document->'item' AS item, "
-            + "sales->'city' AS sales_dot_city, "
-            + "sales_dot_medium->'type' AS sales_dot_medium_dot_type "
+            + "SELECT document->'item' AS \"item\", "
+            + "sales->'city' AS \"sales_dot_city\", "
+            + "sales_dot_medium->'type' AS \"sales_dot_medium_dot_type\" "
             + "FROM table2 WHERE sales->>'city' = ?",
         sql);
 
@@ -799,7 +800,7 @@ void testUnnestWithRegularFilterAtSecondLevelArray() {
             + "table0 as (SELECT * from testCollection WHERE CAST (document->>'quantity' AS NUMERIC) > ?),\n"
             + "table1 as (SELECT * from table0 t0 LEFT JOIN LATERAL jsonb_array_elements(document->'sales') p1(sales) on TRUE),\n"
             + "table2 as (SELECT * from table1 t1 LEFT JOIN LATERAL jsonb_array_elements(sales->'medium') p2(sales_dot_medium) on TRUE)\n"
-            + "SELECT document->'item' AS item, document->'price' AS price, sales->'city' AS sales_dot_city, sales_dot_medium->'type' AS sales_dot_medium_dot_type FROM table2 WHERE sales_dot_medium->>'type' = ?",
+            + "SELECT document->'item' AS \"item\", document->'price' AS \"price\", sales->'city' AS \"sales_dot_city\", sales_dot_medium->'type' AS \"sales_dot_medium_dot_type\" FROM table2 WHERE sales_dot_medium->>'type' = ?",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
@@ -839,7 +840,7 @@ void testUnnestWithRegularORFilterAtSecondLevelArray() {
             + "table0 as (SELECT * from testCollection),\n"
             + "table1 as (SELECT * from table0 t0 LEFT JOIN LATERAL jsonb_array_elements(document->'sales') p1(sales) on TRUE),\n"
             + "table2 as (SELECT * from table1 t1 LEFT JOIN LATERAL jsonb_array_elements(sales->'medium') p2(sales_dot_medium) on TRUE)\n"
-            + "SELECT document->'item' AS item, document->'price' AS price, sales->'city' AS sales_dot_city, sales_dot_medium->'type' AS sales_dot_medium_dot_type FROM table2 WHERE (CAST (document->>'quantity' AS NUMERIC) > ?) OR (sales_dot_medium->>'type' = ?)",
+            + "SELECT document->'item' AS \"item\", document->'price' AS \"price\", sales->'city' AS \"sales_dot_city\", sales_dot_medium->'type' AS \"sales_dot_medium_dot_type\" FROM table2 WHERE (CAST (document->>'quantity' AS NUMERIC) > ?) OR (sales_dot_medium->>'type' = ?)",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
@@ -888,7 +889,7 @@ void testUnnestWithRegularAndORFilterAtSecondLevelArray() {
             + "table0 as (SELECT * from testCollection WHERE CAST (document->>'price' AS NUMERIC) > ?),\n"
             + "table1 as (SELECT * from table0 t0 LEFT JOIN LATERAL jsonb_array_elements(document->'sales') p1(sales) on TRUE),\n"
             + "table2 as (SELECT * from table1 t1 LEFT JOIN LATERAL jsonb_array_elements(sales->'medium') p2(sales_dot_medium) on TRUE)\n"
-            + "SELECT document->'item' AS item, document->'price' AS price, sales->'city' AS sales_dot_city, sales_dot_medium->'type' AS sales_dot_medium_dot_type FROM table2 WHERE (CAST (document->>'quantity' AS NUMERIC) > ?) OR (sales_dot_medium->>'type' = ?)",
+            + "SELECT document->'item' AS \"item\", document->'price' AS \"price\", sales->'city' AS \"sales_dot_city\", sales_dot_medium->'type' AS \"sales_dot_medium_dot_type\" FROM table2 WHERE (CAST (document->>'quantity' AS NUMERIC) > ?) OR (sales_dot_medium->>'type' = ?)",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
@@ -937,7 +938,7 @@ void testUnnestWithRegularAndUnnestFilterAtSecondLevelArray() {
             + "table0 as (SELECT * from testCollection WHERE CAST (document->>'quantity' AS NUMERIC) > ?),\n"
             + "table1 as (SELECT * from table0 t0 LEFT JOIN LATERAL jsonb_array_elements(document->'sales') p1(sales) on TRUE),\n"
             + "table2 as (SELECT * from table1 t1 LEFT JOIN LATERAL jsonb_array_elements(sales->'medium') p2(sales_dot_medium) on TRUE)\n"
-            + "SELECT document->'item' AS item, document->'quantity' AS quantity, sales->'city' AS sales_dot_city, sales_dot_medium->'type' AS sales_dot_medium_dot_type FROM table2 WHERE (sales_dot_medium->>'type' = ?) AND (sales_dot_medium->>'type' = ?)",
+            + "SELECT document->'item' AS \"item\", document->'quantity' AS \"quantity\", sales->'city' AS \"sales_dot_city\", sales_dot_medium->'type' AS \"sales_dot_medium_dot_type\" FROM table2 WHERE (sales_dot_medium->>'type' = ?) AND (sales_dot_medium->>'type' = ?)",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
@@ -986,7 +987,7 @@ void testUnnestWithRegularAndDifferentUnnestFilterAtSecondLevelArray() {
             + "table0 as (SELECT * from testCollection WHERE CAST (document->>'quantity' AS NUMERIC) > ?),\n"
             + "table1 as (SELECT * from table0 t0 LEFT JOIN LATERAL jsonb_array_elements(document->'sales') p1(sales) on TRUE),\n"
             + "table2 as (SELECT * from table1 t1 LEFT JOIN LATERAL jsonb_array_elements(sales->'medium') p2(sales_dot_medium) on TRUE)\n"
-            + "SELECT document->'item' AS item, document->'quantity' AS quantity, sales->'city' AS sales_dot_city, sales_dot_medium->'type' AS sales_dot_medium_dot_type FROM table2 WHERE (sales_dot_medium->>'type' = ?) AND (sales_dot_medium->>'channel' = ?)",
+            + "SELECT document->'item' AS \"item\", document->'quantity' AS \"quantity\", sales->'city' AS \"sales_dot_city\", sales_dot_medium->'type' AS \"sales_dot_medium_dot_type\" FROM table2 WHERE (sales_dot_medium->>'type' = ?) AND (sales_dot_medium->>'channel' = ?)",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
@@ -1034,7 +1035,7 @@ void testUnnestWithRegularAndDifferentUnnestFilterAtFirstLevelArray() {
             + "table0 as (SELECT * from testCollection WHERE CAST (document->>'quantity' AS NUMERIC) > ?),\n"
             + "table1 as (SELECT * from table0 t0 LEFT JOIN LATERAL jsonb_array_elements(document->'sales') p1(sales) on TRUE),\n"
             + "table2 as (SELECT * from table1 t1 LEFT JOIN LATERAL jsonb_array_elements(sales->'medium') p2(sales_dot_medium) on TRUE)\n"
-            + "SELECT document->'item' AS item, document->'quantity' AS quantity, sales->'city' AS sales_dot_city FROM table2 WHERE (sales->>'channel' = ?) AND (sales->>'city' = ?)",
+            + "SELECT document->'item' AS \"item\", document->'quantity' AS \"quantity\", sales->'city' AS \"sales_dot_city\" FROM table2 WHERE (sales->>'channel' = ?) AND (sales->>'city' = ?)",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
@@ -1070,7 +1071,7 @@ void testQueryQ1AggregationFilterWithStringAlongWithNonAliasFields() {
 
     assertEquals(
         "SELECT COUNT(DISTINCT document->>'quantity' ) AS \"qty_count\", "
-            + "document->'item' AS item, document->'price' AS price "
+            + "document->'item' AS \"item\", document->'price' AS \"price\" "
             + "FROM testCollection GROUP BY document->'item',document->'price' "
             + "HAVING (COUNT(DISTINCT document->>'quantity' ) <= ?) AND (CAST (document->'item' AS TEXT) = ?)",
         sql);
@@ -1113,7 +1114,7 @@ void testQueryQ1AggregationFilterWithStringInFilterAlongWithNonAliasFields() {
 
     assertEquals(
         "SELECT COUNT(DISTINCT document->>'quantity' ) AS \"qty_count\", "
-            + "document->'item' AS item, document->'price' AS price "
+            + "document->'item' AS \"item\", document->'price' AS \"price\" "
             + "FROM testCollection GROUP BY document->'item',document->'price' "
             + "HAVING (COUNT(DISTINCT document->>'quantity' ) <= ?) AND (CAST (document->'item' AS TEXT) IN (?, ?, ?, ?))",
         sql);
@@ -1192,7 +1193,7 @@ void testQueryWithFunctionalLhsInRelationalFilter() {
     final String sql = postgresQueryParser.parse();
 
     assertEquals(
-        "SELECT document->'item' AS item "
+        "SELECT document->'item' AS \"item\" "
             + "FROM testCollection "
             + "WHERE CAST (document->>'quantity' AS NUMERIC) * CAST (document->>'price' AS NUMERIC) > ? "
             + "ORDER BY document->'item' DESC NULLS LAST",
@@ -1224,7 +1225,7 @@ void testQueryQ1DistinctCountAggregationWithMatchingSelectionAndGroupBy() {
 
     assertEquals(
         "SELECT COUNT(DISTINCT document->>'quantity' ) AS \"qty_count\", "
-            + "document->'item' AS item "
+            + "document->'item' AS \"item\" "
             + "FROM testCollection WHERE CAST (document->>'price' AS NUMERIC) <= ? "
             + "GROUP BY document->'item'",
         sql);
@@ -1348,7 +1349,7 @@ void testContainsAndUnnestFilters() throws IOException {
         "With \n"
             + "table0 as (SELECT * from testCollection),\n"
             + "table1 as (SELECT * from table0 t0, jsonb_array_elements(document->'sales') p1(sales))\n"
-            + "SELECT document->'item' AS item, sales->'medium' AS sales_dot_medium FROM table1 WHERE sales->'medium' @> ?::jsonb",
+            + "SELECT document->'item' AS \"item\", sales->'medium' AS \"sales_dot_medium\" FROM table1 WHERE sales->'medium' @> ?::jsonb",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
@@ -1383,7 +1384,7 @@ void testNotContainsAndUnnestFilters() throws IOException {
         "With \n"
             + "table0 as (SELECT * from testCollection),\n"
             + "table1 as (SELECT * from table0 t0, jsonb_array_elements(document->'sales') p1(sales))\n"
-            + "SELECT document->'item' AS item, sales->'medium' AS sales_dot_medium FROM table1 WHERE sales->'medium' IS NULL OR NOT sales->'medium' @> ?::jsonb",
+            + "SELECT document->'item' AS \"item\", sales->'medium' AS \"sales_dot_medium\" FROM table1 WHERE sales->'medium' IS NULL OR NOT sales->'medium' @> ?::jsonb",
         sql);
 
     Params params = postgresQueryParser.getParamsBuilder().build();
diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml
index 1491b06f..94f32ab5 100644
--- a/owasp-suppressions.xml
+++ b/owasp-suppressions.xml
@@ -1,3 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-</suppressions> 
\ No newline at end of file
+  <suppress until="2023-08-30Z">
+    <notes><![CDATA[
+  file name: jackson-databind-2.15.1.jar
+  ]]></notes>
+    <!-- No fix available yet (Disputed) -->
+    <!-- Transitive from other dependencies -->
+    <packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
+    <cve>CVE-2023-35116</cve>
+  </suppress>
+</suppressions>