diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
index 873c6d88e..72110fb68 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
@@ -99,13 +99,13 @@ class EqlAdapter<T> extends EQLBaseListener {
   @Override
   public void enterSelect_clause(EQLParser.Select_clauseContext ctx) {
 
-    checkChildren(ctx, 4);
+    // with or without surrounding ( and )
+    int childCount = ctx.getChildCount();
+    String clause = trimParenthesis(child(ctx, childCount - 1));
     if (DISTINCT.equals(child(ctx, 1))) {
       query.setDistinct(true);
-      query.select(child(ctx, 3));
-    } else {
-      query.select(child(ctx, 2));
     }
+    query.select(clause);
   }
 
   @Override
@@ -113,24 +113,46 @@ class EqlAdapter<T> extends EQLBaseListener {
 
     int childCount = ctx.getChildCount();
     checkChildren(ctx, 2);
-    String path = child(ctx, 1);
 
-    int noPropertiesLength = 2;
+    String maybePath = child(ctx, 1);
+    FetchConfig fetchConfig = ParseFetchConfig.parse(maybePath);
 
-    FetchConfig fetchConfig = ParseFetchConfig.parse(path);
-    if (fetchConfig != null) {
-      noPropertiesLength = 3;
-      path = child(ctx, 2);
+    int propsIndex = 2;
+
+    String path;
+    if (fetchConfig == null) {
+      path = trimQuotes(maybePath);
+    } else {
+      propsIndex = 3;
+      path = trimQuotes(child(ctx, 2));
     }
-    if (childCount == noPropertiesLength) {
+
+    if (childCount == propsIndex) {
       query.fetch(path, fetchConfig);
 
     } else {
-      String fetchProperties = trimParenthesis(ctx.getChild(noPropertiesLength).getText());
-      query.fetch(path, fetchProperties, fetchConfig);
+      String properties = trimParenthesis(ctx.getChild(propsIndex).getText());
+      query.fetch(path, properties, fetchConfig);
     }
   }
 
+  /**
+   * Trim leading '(' and trailing ')'
+   */
+  private String trimParenthesis(String text) {
+    if (text.charAt(0) == '(') {
+      return text.substring(1, text.length() - 1);
+    }
+    return text;
+  }
+
+  private String trimQuotes(String path) {
+    if (path.charAt(0) == '\'' || path.charAt(0) == '`') {
+      return path.substring(1, path.length() - 1);
+    }
+    return path;
+  }
+
   @Override
   public void enterOrderby_property(EQLParser.Orderby_propertyContext ctx) {
 
@@ -177,15 +199,6 @@ class EqlAdapter<T> extends EQLBaseListener {
     }
   }
 
-  /**
-   * Trim leading '(' and trailing ')'
-   */
-  private String trimParenthesis(String text) {
-    text = text.substring(1);
-    text = text.substring(0, text.length() - 1);
-    return text;
-  }
-
   private String getLeftHandSidePath(ParserRuleContext ctx) {
     TerminalNode pathToken = ctx.getToken(EQLLexer.PATH_VARIABLE, 0);
     return pathToken.getText();
@@ -399,7 +412,7 @@ class EqlAdapter<T> extends EQLBaseListener {
    */
   private void checkChildren(ParserRuleContext ctx, int min) {
     if (ctx.getChildCount() < min) {
-      throw new IllegalStateException("expecting " + min + " children for comparison? " + ctx);
+      throw new IllegalStateException("expecting " + min + " children for comparison but got " + ctx.getChildCount());
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
index de112001d..cbba0145d 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'select'
 '('
 ')'
+'select'
 'distinct'
 'where'
 'order'
@@ -66,6 +66,8 @@ null
 null
 null
 null
+null
+null
 '0'
 null
 null
@@ -134,6 +136,8 @@ null
 null
 INPUT_VARIABLE
 PATH_VARIABLE
+QUOTED_PATH_VARIABLE
+PROP_FORMULA
 BOOLEAN_LITERAL
 NUMBER_LITERAL
 DOUBLE
@@ -144,6 +148,7 @@ WS
 
 rule names:
 select_statement
+select_properties
 select_clause
 distinct
 fetch_clause
@@ -157,6 +162,7 @@ offset_clause
 fetch_path
 fetch_property_set
 fetch_property_group
+fetch_path_path
 fetch_property
 fetch_query_hint
 fetch_lazy_hint
@@ -187,4 +193,4 @@ literal
 
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 71, 338, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 3, 2, 5, 2, 86, 10, 2, 3, 2, 7, 2, 89, 10, 2, 12, 2, 14, 2, 92, 11, 2, 3, 2, 5, 2, 95, 10, 2, 3, 2, 5, 2, 98, 10, 2, 3, 2, 5, 2, 101, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 5, 3, 107, 10, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 7, 7, 125, 10, 7, 12, 7, 14, 7, 128, 11, 7, 3, 8, 3, 8, 5, 8, 132, 10, 8, 3, 8, 5, 8, 135, 10, 8, 3, 9, 3, 9, 3, 9, 3, 9, 5, 9, 141, 10, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 5, 11, 148, 10, 11, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 5, 13, 155, 10, 13, 3, 13, 3, 13, 5, 13, 159, 10, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 7, 15, 168, 10, 15, 12, 15, 14, 15, 171, 11, 15, 3, 16, 3, 16, 3, 16, 5, 16, 176, 10, 16, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 5, 19, 186, 10, 19, 3, 20, 3, 20, 5, 20, 190, 10, 20, 3, 21, 3, 21, 5, 21, 194, 10, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 7, 23, 203, 10, 23, 12, 23, 14, 23, 206, 11, 23, 3, 24, 3, 24, 3, 24, 7, 24, 211, 10, 24, 12, 24, 14, 24, 214, 11, 24, 3, 25, 5, 25, 217, 10, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 5, 26, 226, 10, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 5, 27, 242, 10, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 7, 29, 253, 10, 29, 12, 29, 14, 29, 256, 11, 29, 3, 29, 3, 29, 5, 29, 260, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 5, 33, 285, 10, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 5, 34, 295, 10, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 5, 35, 302, 10, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 5, 36, 312, 10, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 5, 39, 328, 10, 39, 3, 40, 3, 40, 3, 41, 3, 41, 5, 41, 334, 10, 41, 3, 42, 3, 42, 3, 42, 2, 2, 43, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 2, 6, 3, 2, 14, 15, 3, 2, 38, 45, 3, 2, 46, 62, 4, 2, 65, 66, 70, 70, 2, 339, 2, 85, 3, 2, 2, 2, 4, 104, 3, 2, 2, 2, 6, 112, 3, 2, 2, 2, 8, 114, 3, 2, 2, 2, 10, 116, 3, 2, 2, 2, 12, 119, 3, 2, 2, 2, 14, 129, 3, 2, 2, 2, 16, 140, 3, 2, 2, 2, 18, 142, 3, 2, 2, 2, 20, 144, 3, 2, 2, 2, 22, 149, 3, 2, 2, 2, 24, 152, 3, 2, 2, 2, 26, 160, 3, 2, 2, 2, 28, 164, 3, 2, 2, 2, 30, 175, 3, 2, 2, 2, 32, 177, 3, 2, 2, 2, 34, 180, 3, 2, 2, 2, 36, 185, 3, 2, 2, 2, 38, 187, 3, 2, 2, 2, 40, 191, 3, 2, 2, 2, 42, 195, 3, 2, 2, 2, 44, 199, 3, 2, 2, 2, 46, 207, 3, 2, 2, 2, 48, 216, 3, 2, 2, 2, 50, 225, 3, 2, 2, 2, 52, 241, 3, 2, 2, 2, 54, 243, 3, 2, 2, 2, 56, 259, 3, 2, 2, 2, 58, 261, 3, 2, 2, 2, 60, 267, 3, 2, 2, 2, 62, 273, 3, 2, 2, 2, 64, 284, 3, 2, 2, 2, 66, 294, 3, 2, 2, 2, 68, 301, 3, 2, 2, 2, 70, 311, 3, 2, 2, 2, 72, 313, 3, 2, 2, 2, 74, 317, 3, 2, 2, 2, 76, 327, 3, 2, 2, 2, 78, 329, 3, 2, 2, 2, 80, 333, 3, 2, 2, 2, 82, 335, 3, 2, 2, 2, 84, 86, 5, 4, 3, 2, 85, 84, 3, 2, 2, 2, 85, 86, 3, 2, 2, 2, 86, 90, 3, 2, 2, 2, 87, 89, 5, 8, 5, 2, 88, 87, 3, 2, 2, 2, 89, 92, 3, 2, 2, 2, 90, 88, 3, 2, 2, 2, 90, 91, 3, 2, 2, 2, 91, 94, 3, 2, 2, 2, 92, 90, 3, 2, 2, 2, 93, 95, 5, 10, 6, 2, 94, 93, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 97, 3, 2, 2, 2, 96, 98, 5, 12, 7, 2, 97, 96, 3, 2, 2, 2, 97, 98, 3, 2, 2, 2, 98, 100, 3, 2, 2, 2, 99, 101, 5, 20, 11, 2, 100, 99, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 102, 3, 2, 2, 2, 102, 103, 7, 2, 2, 3, 103, 3, 3, 2, 2, 2, 104, 106, 7, 3, 2, 2, 105, 107, 5, 6, 4, 2, 106, 105, 3, 2, 2, 2, 106, 107, 3, 2, 2, 2, 107, 108, 3, 2, 2, 2, 108, 109, 7, 4, 2, 2, 109, 110, 5, 28, 15, 2, 110, 111, 7, 5, 2, 2, 111, 5, 3, 2, 2, 2, 112, 113, 7, 6, 2, 2, 113, 7, 3, 2, 2, 2, 114, 115, 5, 24, 13, 2, 115, 9, 3, 2, 2, 2, 116, 117, 7, 7, 2, 2, 117, 118, 5, 44, 23, 2, 118, 11, 3, 2, 2, 2, 119, 120, 7, 8, 2, 2, 120, 121, 7, 9, 2, 2, 121, 126, 5, 14, 8, 2, 122, 123, 7, 10, 2, 2, 123, 125, 5, 14, 8, 2, 124, 122, 3, 2, 2, 2, 125, 128, 3, 2, 2, 2, 126, 124, 3, 2, 2, 2, 126, 127, 3, 2, 2, 2, 127, 13, 3, 2, 2, 2, 128, 126, 3, 2, 2, 2, 129, 131, 7, 64, 2, 2, 130, 132, 5, 18, 10, 2, 131, 130, 3, 2, 2, 2, 131, 132, 3, 2, 2, 2, 132, 134, 3, 2, 2, 2, 133, 135, 5, 16, 9, 2, 134, 133, 3, 2, 2, 2, 134, 135, 3, 2, 2, 2, 135, 15, 3, 2, 2, 2, 136, 137, 7, 11, 2, 2, 137, 141, 7, 12, 2, 2, 138, 139, 7, 11, 2, 2, 139, 141, 7, 13, 2, 2, 140, 136, 3, 2, 2, 2, 140, 138, 3, 2, 2, 2, 141, 17, 3, 2, 2, 2, 142, 143, 9, 2, 2, 2, 143, 19, 3, 2, 2, 2, 144, 145, 7, 16, 2, 2, 145, 147, 7, 66, 2, 2, 146, 148, 5, 22, 12, 2, 147, 146, 3, 2, 2, 2, 147, 148, 3, 2, 2, 2, 148, 21, 3, 2, 2, 2, 149, 150, 7, 17, 2, 2, 150, 151, 7, 66, 2, 2, 151, 23, 3, 2, 2, 2, 152, 154, 7, 18, 2, 2, 153, 155, 5, 36, 19, 2, 154, 153, 3, 2, 2, 2, 154, 155, 3, 2, 2, 2, 155, 156, 3, 2, 2, 2, 156, 158, 7, 64, 2, 2, 157, 159, 5, 26, 14, 2, 158, 157, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 25, 3, 2, 2, 2, 160, 161, 7, 4, 2, 2, 161, 162, 5, 28, 15, 2, 162, 163, 7, 5, 2, 2, 163, 27, 3, 2, 2, 2, 164, 169, 5, 30, 16, 2, 165, 166, 7, 10, 2, 2, 166, 168, 5, 30, 16, 2, 167, 165, 3, 2, 2, 2, 168, 171, 3, 2, 2, 2, 169, 167, 3, 2, 2, 2, 169, 170, 3, 2, 2, 2, 170, 29, 3, 2, 2, 2, 171, 169, 3, 2, 2, 2, 172, 176, 7, 64, 2, 2, 173, 176, 5, 32, 17, 2, 174, 176, 5, 34, 18, 2, 175, 172, 3, 2, 2, 2, 175, 173, 3, 2, 2, 2, 175, 174, 3, 2, 2, 2, 176, 31, 3, 2, 2, 2, 177, 178, 7, 19, 2, 2, 178, 179, 5, 38, 20, 2, 179, 33, 3, 2, 2, 2, 180, 181, 7, 19, 2, 2, 181, 182, 5, 40, 21, 2, 182, 35, 3, 2, 2, 2, 183, 186, 5, 38, 20, 2, 184, 186, 5, 40, 21, 2, 185, 183, 3, 2, 2, 2, 185, 184, 3, 2, 2, 2, 186, 37, 3, 2, 2, 2, 187, 189, 7, 20, 2, 2, 188, 190, 5, 42, 22, 2, 189, 188, 3, 2, 2, 2, 189, 190, 3, 2, 2, 2, 190, 39, 3, 2, 2, 2, 191, 193, 7, 21, 2, 2, 192, 194, 5, 42, 22, 2, 193, 192, 3, 2, 2, 2, 193, 194, 3, 2, 2, 2, 194, 41, 3, 2, 2, 2, 195, 196, 7, 4, 2, 2, 196, 197, 7, 66, 2, 2, 197, 198, 7, 5, 2, 2, 198, 43, 3, 2, 2, 2, 199, 204, 5, 46, 24, 2, 200, 201, 7, 22, 2, 2, 201, 203, 5, 46, 24, 2, 202, 200, 3, 2, 2, 2, 203, 206, 3, 2, 2, 2, 204, 202, 3, 2, 2, 2, 204, 205, 3, 2, 2, 2, 205, 45, 3, 2, 2, 2, 206, 204, 3, 2, 2, 2, 207, 212, 5, 48, 25, 2, 208, 209, 7, 23, 2, 2, 209, 211, 5, 48, 25, 2, 210, 208, 3, 2, 2, 2, 211, 214, 3, 2, 2, 2, 212, 210, 3, 2, 2, 2, 212, 213, 3, 2, 2, 2, 213, 47, 3, 2, 2, 2, 214, 212, 3, 2, 2, 2, 215, 217, 7, 24, 2, 2, 216, 215, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 218, 3, 2, 2, 2, 218, 219, 5, 50, 26, 2, 219, 49, 3, 2, 2, 2, 220, 226, 5, 52, 27, 2, 221, 222, 7, 4, 2, 2, 222, 223, 5, 44, 23, 2, 223, 224, 7, 5, 2, 2, 224, 226, 3, 2, 2, 2, 225, 220, 3, 2, 2, 2, 225, 221, 3, 2, 2, 2, 226, 51, 3, 2, 2, 2, 227, 242, 5, 76, 39, 2, 228, 242, 5, 72, 37, 2, 229, 242, 5, 60, 31, 2, 230, 242, 5, 58, 30, 2, 231, 242, 5, 62, 32, 2, 232, 242, 5, 54, 28, 2, 233, 242, 5, 64, 33, 2, 234, 242, 5, 66, 34, 2, 235, 242, 5, 68, 35, 2, 236, 242, 5, 70, 36, 2, 237, 238, 7, 4, 2, 2, 238, 239, 5, 52, 27, 2, 239, 240, 7, 5, 2, 2, 240, 242, 3, 2, 2, 2, 241, 227, 3, 2, 2, 2, 241, 228, 3, 2, 2, 2, 241, 229, 3, 2, 2, 2, 241, 230, 3, 2, 2, 2, 241, 231, 3, 2, 2, 2, 241, 232, 3, 2, 2, 2, 241, 233, 3, 2, 2, 2, 241, 234, 3, 2, 2, 2, 241, 235, 3, 2, 2, 2, 241, 236, 3, 2, 2, 2, 241, 237, 3, 2, 2, 2, 242, 53, 3, 2, 2, 2, 243, 244, 7, 64, 2, 2, 244, 245, 7, 25, 2, 2, 245, 246, 5, 56, 29, 2, 246, 55, 3, 2, 2, 2, 247, 260, 7, 63, 2, 2, 248, 249, 7, 4, 2, 2, 249, 254, 5, 80, 41, 2, 250, 251, 7, 10, 2, 2, 251, 253, 5, 80, 41, 2, 252, 250, 3, 2, 2, 2, 253, 256, 3, 2, 2, 2, 254, 252, 3, 2, 2, 2, 254, 255, 3, 2, 2, 2, 255, 257, 3, 2, 2, 2, 256, 254, 3, 2, 2, 2, 257, 258, 7, 5, 2, 2, 258, 260, 3, 2, 2, 2, 259, 247, 3, 2, 2, 2, 259, 248, 3, 2, 2, 2, 260, 57, 3, 2, 2, 2, 261, 262, 7, 64, 2, 2, 262, 263, 7, 26, 2, 2, 263, 264, 5, 80, 41, 2, 264, 265, 7, 23, 2, 2, 265, 266, 5, 80, 41, 2, 266, 59, 3, 2, 2, 2, 267, 268, 7, 64, 2, 2, 268, 269, 7, 27, 2, 2, 269, 270, 5, 80, 41, 2, 270, 271, 7, 28, 2, 2, 271, 272, 5, 80, 41, 2, 272, 61, 3, 2, 2, 2, 273, 274, 5, 80, 41, 2, 274, 275, 7, 26, 2, 2, 275, 276, 7, 64, 2, 2, 276, 277, 7, 23, 2, 2, 277, 278, 7, 64, 2, 2, 278, 63, 3, 2, 2, 2, 279, 280, 7, 64, 2, 2, 280, 281, 7, 29, 2, 2, 281, 285, 7, 30, 2, 2, 282, 283, 7, 64, 2, 2, 283, 285, 7, 31, 2, 2, 284, 279, 3, 2, 2, 2, 284, 282, 3, 2, 2, 2, 285, 65, 3, 2, 2, 2, 286, 287, 7, 64, 2, 2, 287, 288, 7, 29, 2, 2, 288, 289, 7, 24, 2, 2, 289, 295, 7, 30, 2, 2, 290, 291, 7, 64, 2, 2, 291, 295, 7, 32, 2, 2, 292, 293, 7, 64, 2, 2, 293, 295, 7, 33, 2, 2, 294, 286, 3, 2, 2, 2, 294, 290, 3, 2, 2, 2, 294, 292, 3, 2, 2, 2, 295, 67, 3, 2, 2, 2, 296, 297, 7, 64, 2, 2, 297, 298, 7, 29, 2, 2, 298, 302, 7, 34, 2, 2, 299, 300, 7, 64, 2, 2, 300, 302, 7, 35, 2, 2, 301, 296, 3, 2, 2, 2, 301, 299, 3, 2, 2, 2, 302, 69, 3, 2, 2, 2, 303, 304, 7, 64, 2, 2, 304, 305, 7, 29, 2, 2, 305, 306, 7, 24, 2, 2, 306, 312, 7, 34, 2, 2, 307, 308, 7, 64, 2, 2, 308, 312, 7, 36, 2, 2, 309, 310, 7, 64, 2, 2, 310, 312, 7, 37, 2, 2, 311, 303, 3, 2, 2, 2, 311, 307, 3, 2, 2, 2, 311, 309, 3, 2, 2, 2, 312, 71, 3, 2, 2, 2, 313, 314, 7, 64, 2, 2, 314, 315, 5, 74, 38, 2, 315, 316, 5, 80, 41, 2, 316, 73, 3, 2, 2, 2, 317, 318, 9, 3, 2, 2, 318, 75, 3, 2, 2, 2, 319, 320, 7, 64, 2, 2, 320, 321, 5, 78, 40, 2, 321, 322, 5, 80, 41, 2, 322, 328, 3, 2, 2, 2, 323, 324, 5, 80, 41, 2, 324, 325, 5, 78, 40, 2, 325, 326, 7, 64, 2, 2, 326, 328, 3, 2, 2, 2, 327, 319, 3, 2, 2, 2, 327, 323, 3, 2, 2, 2, 328, 77, 3, 2, 2, 2, 329, 330, 9, 4, 2, 2, 330, 79, 3, 2, 2, 2, 331, 334, 5, 82, 42, 2, 332, 334, 7, 63, 2, 2, 333, 331, 3, 2, 2, 2, 333, 332, 3, 2, 2, 2, 334, 81, 3, 2, 2, 2, 335, 336, 9, 5, 2, 2, 336, 83, 3, 2, 2, 2, 33, 85, 90, 94, 97, 100, 106, 126, 131, 134, 140, 147, 154, 158, 169, 175, 185, 189, 193, 204, 212, 216, 225, 241, 254, 259, 284, 294, 301, 311, 327, 333]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 73, 350, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 3, 2, 5, 2, 90, 10, 2, 3, 2, 7, 2, 93, 10, 2, 12, 2, 14, 2, 96, 11, 2, 3, 2, 5, 2, 99, 10, 2, 3, 2, 5, 2, 102, 10, 2, 3, 2, 5, 2, 105, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 114, 10, 3, 3, 4, 3, 4, 5, 4, 118, 10, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 134, 10, 8, 12, 8, 14, 8, 137, 11, 8, 3, 9, 3, 9, 5, 9, 141, 10, 9, 3, 9, 5, 9, 144, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 150, 10, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 5, 12, 157, 10, 12, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 5, 14, 164, 10, 14, 3, 14, 3, 14, 5, 14, 168, 10, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 7, 16, 177, 10, 16, 12, 16, 14, 16, 180, 11, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 5, 18, 188, 10, 18, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 5, 21, 198, 10, 21, 3, 22, 3, 22, 5, 22, 202, 10, 22, 3, 23, 3, 23, 5, 23, 206, 10, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 7, 25, 215, 10, 25, 12, 25, 14, 25, 218, 11, 25, 3, 26, 3, 26, 3, 26, 7, 26, 223, 10, 26, 12, 26, 14, 26, 226, 11, 26, 3, 27, 5, 27, 229, 10, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 5, 28, 238, 10, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 5, 29, 254, 10, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 7, 31, 265, 10, 31, 12, 31, 14, 31, 268, 11, 31, 3, 31, 3, 31, 5, 31, 272, 10, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 5, 35, 297, 10, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 5, 36, 307, 10, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 5, 37, 314, 10, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 5, 38, 324, 10, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 5, 41, 340, 10, 41, 3, 42, 3, 42, 3, 43, 3, 43, 5, 43, 346, 10, 43, 3, 44, 3, 44, 3, 44, 2, 2, 45, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 2, 7, 3, 2, 14, 15, 3, 2, 64, 65, 3, 2, 38, 45, 3, 2, 46, 62, 4, 2, 67, 68, 72, 72, 2, 351, 2, 89, 3, 2, 2, 2, 4, 113, 3, 2, 2, 2, 6, 115, 3, 2, 2, 2, 8, 121, 3, 2, 2, 2, 10, 123, 3, 2, 2, 2, 12, 125, 3, 2, 2, 2, 14, 128, 3, 2, 2, 2, 16, 138, 3, 2, 2, 2, 18, 149, 3, 2, 2, 2, 20, 151, 3, 2, 2, 2, 22, 153, 3, 2, 2, 2, 24, 158, 3, 2, 2, 2, 26, 161, 3, 2, 2, 2, 28, 169, 3, 2, 2, 2, 30, 173, 3, 2, 2, 2, 32, 181, 3, 2, 2, 2, 34, 187, 3, 2, 2, 2, 36, 189, 3, 2, 2, 2, 38, 192, 3, 2, 2, 2, 40, 197, 3, 2, 2, 2, 42, 199, 3, 2, 2, 2, 44, 203, 3, 2, 2, 2, 46, 207, 3, 2, 2, 2, 48, 211, 3, 2, 2, 2, 50, 219, 3, 2, 2, 2, 52, 228, 3, 2, 2, 2, 54, 237, 3, 2, 2, 2, 56, 253, 3, 2, 2, 2, 58, 255, 3, 2, 2, 2, 60, 271, 3, 2, 2, 2, 62, 273, 3, 2, 2, 2, 64, 279, 3, 2, 2, 2, 66, 285, 3, 2, 2, 2, 68, 296, 3, 2, 2, 2, 70, 306, 3, 2, 2, 2, 72, 313, 3, 2, 2, 2, 74, 323, 3, 2, 2, 2, 76, 325, 3, 2, 2, 2, 78, 329, 3, 2, 2, 2, 80, 339, 3, 2, 2, 2, 82, 341, 3, 2, 2, 2, 84, 345, 3, 2, 2, 2, 86, 347, 3, 2, 2, 2, 88, 90, 5, 6, 4, 2, 89, 88, 3, 2, 2, 2, 89, 90, 3, 2, 2, 2, 90, 94, 3, 2, 2, 2, 91, 93, 5, 10, 6, 2, 92, 91, 3, 2, 2, 2, 93, 96, 3, 2, 2, 2, 94, 92, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 98, 3, 2, 2, 2, 96, 94, 3, 2, 2, 2, 97, 99, 5, 12, 7, 2, 98, 97, 3, 2, 2, 2, 98, 99, 3, 2, 2, 2, 99, 101, 3, 2, 2, 2, 100, 102, 5, 14, 8, 2, 101, 100, 3, 2, 2, 2, 101, 102, 3, 2, 2, 2, 102, 104, 3, 2, 2, 2, 103, 105, 5, 22, 12, 2, 104, 103, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 107, 7, 2, 2, 3, 107, 3, 3, 2, 2, 2, 108, 109, 7, 3, 2, 2, 109, 110, 5, 30, 16, 2, 110, 111, 7, 4, 2, 2, 111, 114, 3, 2, 2, 2, 112, 114, 5, 30, 16, 2, 113, 108, 3, 2, 2, 2, 113, 112, 3, 2, 2, 2, 114, 5, 3, 2, 2, 2, 115, 117, 7, 5, 2, 2, 116, 118, 5, 8, 5, 2, 117, 116, 3, 2, 2, 2, 117, 118, 3, 2, 2, 2, 118, 119, 3, 2, 2, 2, 119, 120, 5, 4, 3, 2, 120, 7, 3, 2, 2, 2, 121, 122, 7, 6, 2, 2, 122, 9, 3, 2, 2, 2, 123, 124, 5, 26, 14, 2, 124, 11, 3, 2, 2, 2, 125, 126, 7, 7, 2, 2, 126, 127, 5, 48, 25, 2, 127, 13, 3, 2, 2, 2, 128, 129, 7, 8, 2, 2, 129, 130, 7, 9, 2, 2, 130, 135, 5, 16, 9, 2, 131, 132, 7, 10, 2, 2, 132, 134, 5, 16, 9, 2, 133, 131, 3, 2, 2, 2, 134, 137, 3, 2, 2, 2, 135, 133, 3, 2, 2, 2, 135, 136, 3, 2, 2, 2, 136, 15, 3, 2, 2, 2, 137, 135, 3, 2, 2, 2, 138, 140, 7, 64, 2, 2, 139, 141, 5, 20, 11, 2, 140, 139, 3, 2, 2, 2, 140, 141, 3, 2, 2, 2, 141, 143, 3, 2, 2, 2, 142, 144, 5, 18, 10, 2, 143, 142, 3, 2, 2, 2, 143, 144, 3, 2, 2, 2, 144, 17, 3, 2, 2, 2, 145, 146, 7, 11, 2, 2, 146, 150, 7, 12, 2, 2, 147, 148, 7, 11, 2, 2, 148, 150, 7, 13, 2, 2, 149, 145, 3, 2, 2, 2, 149, 147, 3, 2, 2, 2, 150, 19, 3, 2, 2, 2, 151, 152, 9, 2, 2, 2, 152, 21, 3, 2, 2, 2, 153, 154, 7, 16, 2, 2, 154, 156, 7, 68, 2, 2, 155, 157, 5, 24, 13, 2, 156, 155, 3, 2, 2, 2, 156, 157, 3, 2, 2, 2, 157, 23, 3, 2, 2, 2, 158, 159, 7, 17, 2, 2, 159, 160, 7, 68, 2, 2, 160, 25, 3, 2, 2, 2, 161, 163, 7, 18, 2, 2, 162, 164, 5, 40, 21, 2, 163, 162, 3, 2, 2, 2, 163, 164, 3, 2, 2, 2, 164, 165, 3, 2, 2, 2, 165, 167, 5, 32, 17, 2, 166, 168, 5, 28, 15, 2, 167, 166, 3, 2, 2, 2, 167, 168, 3, 2, 2, 2, 168, 27, 3, 2, 2, 2, 169, 170, 7, 3, 2, 2, 170, 171, 5, 30, 16, 2, 171, 172, 7, 4, 2, 2, 172, 29, 3, 2, 2, 2, 173, 178, 5, 34, 18, 2, 174, 175, 7, 10, 2, 2, 175, 177, 5, 34, 18, 2, 176, 174, 3, 2, 2, 2, 177, 180, 3, 2, 2, 2, 178, 176, 3, 2, 2, 2, 178, 179, 3, 2, 2, 2, 179, 31, 3, 2, 2, 2, 180, 178, 3, 2, 2, 2, 181, 182, 9, 3, 2, 2, 182, 33, 3, 2, 2, 2, 183, 188, 7, 64, 2, 2, 184, 188, 5, 36, 19, 2, 185, 188, 5, 38, 20, 2, 186, 188, 7, 66, 2, 2, 187, 183, 3, 2, 2, 2, 187, 184, 3, 2, 2, 2, 187, 185, 3, 2, 2, 2, 187, 186, 3, 2, 2, 2, 188, 35, 3, 2, 2, 2, 189, 190, 7, 19, 2, 2, 190, 191, 5, 42, 22, 2, 191, 37, 3, 2, 2, 2, 192, 193, 7, 19, 2, 2, 193, 194, 5, 44, 23, 2, 194, 39, 3, 2, 2, 2, 195, 198, 5, 42, 22, 2, 196, 198, 5, 44, 23, 2, 197, 195, 3, 2, 2, 2, 197, 196, 3, 2, 2, 2, 198, 41, 3, 2, 2, 2, 199, 201, 7, 20, 2, 2, 200, 202, 5, 46, 24, 2, 201, 200, 3, 2, 2, 2, 201, 202, 3, 2, 2, 2, 202, 43, 3, 2, 2, 2, 203, 205, 7, 21, 2, 2, 204, 206, 5, 46, 24, 2, 205, 204, 3, 2, 2, 2, 205, 206, 3, 2, 2, 2, 206, 45, 3, 2, 2, 2, 207, 208, 7, 3, 2, 2, 208, 209, 7, 68, 2, 2, 209, 210, 7, 4, 2, 2, 210, 47, 3, 2, 2, 2, 211, 216, 5, 50, 26, 2, 212, 213, 7, 22, 2, 2, 213, 215, 5, 50, 26, 2, 214, 212, 3, 2, 2, 2, 215, 218, 3, 2, 2, 2, 216, 214, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 49, 3, 2, 2, 2, 218, 216, 3, 2, 2, 2, 219, 224, 5, 52, 27, 2, 220, 221, 7, 23, 2, 2, 221, 223, 5, 52, 27, 2, 222, 220, 3, 2, 2, 2, 223, 226, 3, 2, 2, 2, 224, 222, 3, 2, 2, 2, 224, 225, 3, 2, 2, 2, 225, 51, 3, 2, 2, 2, 226, 224, 3, 2, 2, 2, 227, 229, 7, 24, 2, 2, 228, 227, 3, 2, 2, 2, 228, 229, 3, 2, 2, 2, 229, 230, 3, 2, 2, 2, 230, 231, 5, 54, 28, 2, 231, 53, 3, 2, 2, 2, 232, 238, 5, 56, 29, 2, 233, 234, 7, 3, 2, 2, 234, 235, 5, 48, 25, 2, 235, 236, 7, 4, 2, 2, 236, 238, 3, 2, 2, 2, 237, 232, 3, 2, 2, 2, 237, 233, 3, 2, 2, 2, 238, 55, 3, 2, 2, 2, 239, 254, 5, 80, 41, 2, 240, 254, 5, 76, 39, 2, 241, 254, 5, 64, 33, 2, 242, 254, 5, 62, 32, 2, 243, 254, 5, 66, 34, 2, 244, 254, 5, 58, 30, 2, 245, 254, 5, 68, 35, 2, 246, 254, 5, 70, 36, 2, 247, 254, 5, 72, 37, 2, 248, 254, 5, 74, 38, 2, 249, 250, 7, 3, 2, 2, 250, 251, 5, 56, 29, 2, 251, 252, 7, 4, 2, 2, 252, 254, 3, 2, 2, 2, 253, 239, 3, 2, 2, 2, 253, 240, 3, 2, 2, 2, 253, 241, 3, 2, 2, 2, 253, 242, 3, 2, 2, 2, 253, 243, 3, 2, 2, 2, 253, 244, 3, 2, 2, 2, 253, 245, 3, 2, 2, 2, 253, 246, 3, 2, 2, 2, 253, 247, 3, 2, 2, 2, 253, 248, 3, 2, 2, 2, 253, 249, 3, 2, 2, 2, 254, 57, 3, 2, 2, 2, 255, 256, 7, 64, 2, 2, 256, 257, 7, 25, 2, 2, 257, 258, 5, 60, 31, 2, 258, 59, 3, 2, 2, 2, 259, 272, 7, 63, 2, 2, 260, 261, 7, 3, 2, 2, 261, 266, 5, 84, 43, 2, 262, 263, 7, 10, 2, 2, 263, 265, 5, 84, 43, 2, 264, 262, 3, 2, 2, 2, 265, 268, 3, 2, 2, 2, 266, 264, 3, 2, 2, 2, 266, 267, 3, 2, 2, 2, 267, 269, 3, 2, 2, 2, 268, 266, 3, 2, 2, 2, 269, 270, 7, 4, 2, 2, 270, 272, 3, 2, 2, 2, 271, 259, 3, 2, 2, 2, 271, 260, 3, 2, 2, 2, 272, 61, 3, 2, 2, 2, 273, 274, 7, 64, 2, 2, 274, 275, 7, 26, 2, 2, 275, 276, 5, 84, 43, 2, 276, 277, 7, 23, 2, 2, 277, 278, 5, 84, 43, 2, 278, 63, 3, 2, 2, 2, 279, 280, 7, 64, 2, 2, 280, 281, 7, 27, 2, 2, 281, 282, 5, 84, 43, 2, 282, 283, 7, 28, 2, 2, 283, 284, 5, 84, 43, 2, 284, 65, 3, 2, 2, 2, 285, 286, 5, 84, 43, 2, 286, 287, 7, 26, 2, 2, 287, 288, 7, 64, 2, 2, 288, 289, 7, 23, 2, 2, 289, 290, 7, 64, 2, 2, 290, 67, 3, 2, 2, 2, 291, 292, 7, 64, 2, 2, 292, 293, 7, 29, 2, 2, 293, 297, 7, 30, 2, 2, 294, 295, 7, 64, 2, 2, 295, 297, 7, 31, 2, 2, 296, 291, 3, 2, 2, 2, 296, 294, 3, 2, 2, 2, 297, 69, 3, 2, 2, 2, 298, 299, 7, 64, 2, 2, 299, 300, 7, 29, 2, 2, 300, 301, 7, 24, 2, 2, 301, 307, 7, 30, 2, 2, 302, 303, 7, 64, 2, 2, 303, 307, 7, 32, 2, 2, 304, 305, 7, 64, 2, 2, 305, 307, 7, 33, 2, 2, 306, 298, 3, 2, 2, 2, 306, 302, 3, 2, 2, 2, 306, 304, 3, 2, 2, 2, 307, 71, 3, 2, 2, 2, 308, 309, 7, 64, 2, 2, 309, 310, 7, 29, 2, 2, 310, 314, 7, 34, 2, 2, 311, 312, 7, 64, 2, 2, 312, 314, 7, 35, 2, 2, 313, 308, 3, 2, 2, 2, 313, 311, 3, 2, 2, 2, 314, 73, 3, 2, 2, 2, 315, 316, 7, 64, 2, 2, 316, 317, 7, 29, 2, 2, 317, 318, 7, 24, 2, 2, 318, 324, 7, 34, 2, 2, 319, 320, 7, 64, 2, 2, 320, 324, 7, 36, 2, 2, 321, 322, 7, 64, 2, 2, 322, 324, 7, 37, 2, 2, 323, 315, 3, 2, 2, 2, 323, 319, 3, 2, 2, 2, 323, 321, 3, 2, 2, 2, 324, 75, 3, 2, 2, 2, 325, 326, 7, 64, 2, 2, 326, 327, 5, 78, 40, 2, 327, 328, 5, 84, 43, 2, 328, 77, 3, 2, 2, 2, 329, 330, 9, 4, 2, 2, 330, 79, 3, 2, 2, 2, 331, 332, 7, 64, 2, 2, 332, 333, 5, 82, 42, 2, 333, 334, 5, 84, 43, 2, 334, 340, 3, 2, 2, 2, 335, 336, 5, 84, 43, 2, 336, 337, 5, 82, 42, 2, 337, 338, 7, 64, 2, 2, 338, 340, 3, 2, 2, 2, 339, 331, 3, 2, 2, 2, 339, 335, 3, 2, 2, 2, 340, 81, 3, 2, 2, 2, 341, 342, 9, 5, 2, 2, 342, 83, 3, 2, 2, 2, 343, 346, 5, 86, 44, 2, 344, 346, 7, 63, 2, 2, 345, 343, 3, 2, 2, 2, 345, 344, 3, 2, 2, 2, 346, 85, 3, 2, 2, 2, 347, 348, 9, 6, 2, 2, 348, 87, 3, 2, 2, 2, 34, 89, 94, 98, 101, 104, 113, 117, 135, 140, 143, 149, 156, 163, 167, 178, 187, 197, 201, 205, 216, 224, 228, 237, 253, 266, 271, 296, 306, 313, 323, 339, 345]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
index 4df1b445f..d6d4462ab 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
@@ -60,16 +60,18 @@ T__58=59
 T__59=60
 INPUT_VARIABLE=61
 PATH_VARIABLE=62
-BOOLEAN_LITERAL=63
-NUMBER_LITERAL=64
-DOUBLE=65
-INT=66
-ZERO=67
-STRING_LITERAL=68
-WS=69
-'select'=1
-'('=2
-')'=3
+QUOTED_PATH_VARIABLE=63
+PROP_FORMULA=64
+BOOLEAN_LITERAL=65
+NUMBER_LITERAL=66
+DOUBLE=67
+INT=68
+ZERO=69
+STRING_LITERAL=70
+WS=71
+'('=1
+')'=2
+'select'=3
 'distinct'=4
 'where'=5
 'order'=6
@@ -127,4 +129,4 @@ WS=69
 'ne'=58
 'ieq'=59
 'ine'=60
-'0'=67
+'0'=69
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index 70c9d6c27..53ac70d05 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -23,6 +23,18 @@ public class EQLBaseListener implements EQLListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitSelect_statement(EQLParser.Select_statementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSelect_properties(EQLParser.Select_propertiesContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSelect_properties(EQLParser.Select_propertiesContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -179,6 +191,18 @@ public class EQLBaseListener implements EQLListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_path_path(EQLParser.Fetch_path_pathContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_path_path(EQLParser.Fetch_path_pathContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
index f7e626b43..971c21a1d 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'select'
 '('
 ')'
+'select'
 'distinct'
 'where'
 'order'
@@ -66,6 +66,8 @@ null
 null
 null
 null
+null
+null
 '0'
 null
 null
@@ -134,6 +136,8 @@ null
 null
 INPUT_VARIABLE
 PATH_VARIABLE
+QUOTED_PATH_VARIABLE
+PROP_FORMULA
 BOOLEAN_LITERAL
 NUMBER_LITERAL
 DOUBLE
@@ -205,6 +209,8 @@ T__58
 T__59
 INPUT_VARIABLE
 PATH_VARIABLE
+QUOTED_PATH_VARIABLE
+PROP_FORMULA
 BOOLEAN_LITERAL
 NUMBER_LITERAL
 DOUBLE
@@ -221,4 +227,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 71, 533, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 7, 62, 464, 10, 62, 12, 62, 14, 62, 467, 11, 62, 3, 63, 3, 63, 7, 63, 471, 10, 63, 12, 63, 14, 63, 474, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 5, 64, 485, 10, 64, 3, 65, 5, 65, 488, 10, 65, 3, 65, 3, 65, 5, 65, 492, 10, 65, 3, 65, 3, 65, 5, 65, 496, 10, 65, 3, 66, 6, 66, 499, 10, 66, 13, 66, 14, 66, 500, 3, 66, 3, 66, 7, 66, 505, 10, 66, 12, 66, 14, 66, 508, 11, 66, 3, 67, 3, 67, 7, 67, 512, 10, 67, 12, 67, 14, 67, 515, 11, 67, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 7, 69, 523, 10, 69, 12, 69, 14, 69, 526, 11, 69, 3, 69, 3, 69, 3, 70, 3, 70, 3, 70, 3, 70, 2, 2, 71, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 544, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 3, 141, 3, 2, 2, 2, 5, 148, 3, 2, 2, 2, 7, 150, 3, 2, 2, 2, 9, 152, 3, 2, 2, 2, 11, 161, 3, 2, 2, 2, 13, 167, 3, 2, 2, 2, 15, 173, 3, 2, 2, 2, 17, 176, 3, 2, 2, 2, 19, 178, 3, 2, 2, 2, 21, 184, 3, 2, 2, 2, 23, 190, 3, 2, 2, 2, 25, 195, 3, 2, 2, 2, 27, 199, 3, 2, 2, 2, 29, 204, 3, 2, 2, 2, 31, 210, 3, 2, 2, 2, 33, 217, 3, 2, 2, 2, 35, 223, 3, 2, 2, 2, 37, 225, 3, 2, 2, 2, 39, 231, 3, 2, 2, 2, 41, 236, 3, 2, 2, 2, 43, 239, 3, 2, 2, 2, 45, 243, 3, 2, 2, 2, 47, 247, 3, 2, 2, 2, 49, 250, 3, 2, 2, 2, 51, 258, 3, 2, 2, 2, 53, 266, 3, 2, 2, 2, 55, 269, 3, 2, 2, 2, 57, 272, 3, 2, 2, 2, 59, 277, 3, 2, 2, 2, 61, 284, 3, 2, 2, 2, 63, 294, 3, 2, 2, 2, 65, 302, 3, 2, 2, 2, 67, 308, 3, 2, 2, 2, 69, 316, 3, 2, 2, 2, 71, 327, 3, 2, 2, 2, 73, 336, 3, 2, 2, 2, 75, 341, 3, 2, 2, 2, 77, 347, 3, 2, 2, 2, 79, 356, 3, 2, 2, 2, 81, 366, 3, 2, 2, 2, 83, 377, 3, 2, 2, 2, 85, 389, 3, 2, 2, 2, 87, 398, 3, 2, 2, 2, 89, 408, 3, 2, 2, 2, 91, 410, 3, 2, 2, 2, 93, 413, 3, 2, 2, 2, 95, 415, 3, 2, 2, 2, 97, 418, 3, 2, 2, 2, 99, 421, 3, 2, 2, 2, 101, 424, 3, 2, 2, 2, 103, 428, 3, 2, 2, 2, 105, 430, 3, 2, 2, 2, 107, 433, 3, 2, 2, 2, 109, 436, 3, 2, 2, 2, 111, 439, 3, 2, 2, 2, 113, 443, 3, 2, 2, 2, 115, 446, 3, 2, 2, 2, 117, 449, 3, 2, 2, 2, 119, 452, 3, 2, 2, 2, 121, 456, 3, 2, 2, 2, 123, 460, 3, 2, 2, 2, 125, 468, 3, 2, 2, 2, 127, 484, 3, 2, 2, 2, 129, 495, 3, 2, 2, 2, 131, 498, 3, 2, 2, 2, 133, 509, 3, 2, 2, 2, 135, 516, 3, 2, 2, 2, 137, 518, 3, 2, 2, 2, 139, 529, 3, 2, 2, 2, 141, 142, 7, 117, 2, 2, 142, 143, 7, 103, 2, 2, 143, 144, 7, 110, 2, 2, 144, 145, 7, 103, 2, 2, 145, 146, 7, 101, 2, 2, 146, 147, 7, 118, 2, 2, 147, 4, 3, 2, 2, 2, 148, 149, 7, 42, 2, 2, 149, 6, 3, 2, 2, 2, 150, 151, 7, 43, 2, 2, 151, 8, 3, 2, 2, 2, 152, 153, 7, 102, 2, 2, 153, 154, 7, 107, 2, 2, 154, 155, 7, 117, 2, 2, 155, 156, 7, 118, 2, 2, 156, 157, 7, 107, 2, 2, 157, 158, 7, 112, 2, 2, 158, 159, 7, 101, 2, 2, 159, 160, 7, 118, 2, 2, 160, 10, 3, 2, 2, 2, 161, 162, 7, 121, 2, 2, 162, 163, 7, 106, 2, 2, 163, 164, 7, 103, 2, 2, 164, 165, 7, 116, 2, 2, 165, 166, 7, 103, 2, 2, 166, 12, 3, 2, 2, 2, 167, 168, 7, 113, 2, 2, 168, 169, 7, 116, 2, 2, 169, 170, 7, 102, 2, 2, 170, 171, 7, 103, 2, 2, 171, 172, 7, 116, 2, 2, 172, 14, 3, 2, 2, 2, 173, 174, 7, 100, 2, 2, 174, 175, 7, 123, 2, 2, 175, 16, 3, 2, 2, 2, 176, 177, 7, 46, 2, 2, 177, 18, 3, 2, 2, 2, 178, 179, 7, 112, 2, 2, 179, 180, 7, 119, 2, 2, 180, 181, 7, 110, 2, 2, 181, 182, 7, 110, 2, 2, 182, 183, 7, 117, 2, 2, 183, 20, 3, 2, 2, 2, 184, 185, 7, 104, 2, 2, 185, 186, 7, 107, 2, 2, 186, 187, 7, 116, 2, 2, 187, 188, 7, 117, 2, 2, 188, 189, 7, 118, 2, 2, 189, 22, 3, 2, 2, 2, 190, 191, 7, 110, 2, 2, 191, 192, 7, 99, 2, 2, 192, 193, 7, 117, 2, 2, 193, 194, 7, 118, 2, 2, 194, 24, 3, 2, 2, 2, 195, 196, 7, 99, 2, 2, 196, 197, 7, 117, 2, 2, 197, 198, 7, 101, 2, 2, 198, 26, 3, 2, 2, 2, 199, 200, 7, 102, 2, 2, 200, 201, 7, 103, 2, 2, 201, 202, 7, 117, 2, 2, 202, 203, 7, 101, 2, 2, 203, 28, 3, 2, 2, 2, 204, 205, 7, 110, 2, 2, 205, 206, 7, 107, 2, 2, 206, 207, 7, 111, 2, 2, 207, 208, 7, 107, 2, 2, 208, 209, 7, 118, 2, 2, 209, 30, 3, 2, 2, 2, 210, 211, 7, 113, 2, 2, 211, 212, 7, 104, 2, 2, 212, 213, 7, 104, 2, 2, 213, 214, 7, 117, 2, 2, 214, 215, 7, 103, 2, 2, 215, 216, 7, 118, 2, 2, 216, 32, 3, 2, 2, 2, 217, 218, 7, 104, 2, 2, 218, 219, 7, 103, 2, 2, 219, 220, 7, 118, 2, 2, 220, 221, 7, 101, 2, 2, 221, 222, 7, 106, 2, 2, 222, 34, 3, 2, 2, 2, 223, 224, 7, 45, 2, 2, 224, 36, 3, 2, 2, 2, 225, 226, 7, 115, 2, 2, 226, 227, 7, 119, 2, 2, 227, 228, 7, 103, 2, 2, 228, 229, 7, 116, 2, 2, 229, 230, 7, 123, 2, 2, 230, 38, 3, 2, 2, 2, 231, 232, 7, 110, 2, 2, 232, 233, 7, 99, 2, 2, 233, 234, 7, 124, 2, 2, 234, 235, 7, 123, 2, 2, 235, 40, 3, 2, 2, 2, 236, 237, 7, 113, 2, 2, 237, 238, 7, 116, 2, 2, 238, 42, 3, 2, 2, 2, 239, 240, 7, 99, 2, 2, 240, 241, 7, 112, 2, 2, 241, 242, 7, 102, 2, 2, 242, 44, 3, 2, 2, 2, 243, 244, 7, 112, 2, 2, 244, 245, 7, 113, 2, 2, 245, 246, 7, 118, 2, 2, 246, 46, 3, 2, 2, 2, 247, 248, 7, 107, 2, 2, 248, 249, 7, 112, 2, 2, 249, 48, 3, 2, 2, 2, 250, 251, 7, 100, 2, 2, 251, 252, 7, 103, 2, 2, 252, 253, 7, 118, 2, 2, 253, 254, 7, 121, 2, 2, 254, 255, 7, 103, 2, 2, 255, 256, 7, 103, 2, 2, 256, 257, 7, 112, 2, 2, 257, 50, 3, 2, 2, 2, 258, 259, 7, 107, 2, 2, 259, 260, 7, 112, 2, 2, 260, 261, 7, 116, 2, 2, 261, 262, 7, 99, 2, 2, 262, 263, 7, 112, 2, 2, 263, 264, 7, 105, 2, 2, 264, 265, 7, 103, 2, 2, 265, 52, 3, 2, 2, 2, 266, 267, 7, 118, 2, 2, 267, 268, 7, 113, 2, 2, 268, 54, 3, 2, 2, 2, 269, 270, 7, 107, 2, 2, 270, 271, 7, 117, 2, 2, 271, 56, 3, 2, 2, 2, 272, 273, 7, 112, 2, 2, 273, 274, 7, 119, 2, 2, 274, 275, 7, 110, 2, 2, 275, 276, 7, 110, 2, 2, 276, 58, 3, 2, 2, 2, 277, 278, 7, 107, 2, 2, 278, 279, 7, 117, 2, 2, 279, 280, 7, 80, 2, 2, 280, 281, 7, 119, 2, 2, 281, 282, 7, 110, 2, 2, 282, 283, 7, 110, 2, 2, 283, 60, 3, 2, 2, 2, 284, 285, 7, 107, 2, 2, 285, 286, 7, 117, 2, 2, 286, 287, 7, 80, 2, 2, 287, 288, 7, 113, 2, 2, 288, 289, 7, 118, 2, 2, 289, 290, 7, 80, 2, 2, 290, 291, 7, 119, 2, 2, 291, 292, 7, 110, 2, 2, 292, 293, 7, 110, 2, 2, 293, 62, 3, 2, 2, 2, 294, 295, 7, 112, 2, 2, 295, 296, 7, 113, 2, 2, 296, 297, 7, 118, 2, 2, 297, 298, 7, 80, 2, 2, 298, 299, 7, 119, 2, 2, 299, 300, 7, 110, 2, 2, 300, 301, 7, 110, 2, 2, 301, 64, 3, 2, 2, 2, 302, 303, 7, 103, 2, 2, 303, 304, 7, 111, 2, 2, 304, 305, 7, 114, 2, 2, 305, 306, 7, 118, 2, 2, 306, 307, 7, 123, 2, 2, 307, 66, 3, 2, 2, 2, 308, 309, 7, 107, 2, 2, 309, 310, 7, 117, 2, 2, 310, 311, 7, 71, 2, 2, 311, 312, 7, 111, 2, 2, 312, 313, 7, 114, 2, 2, 313, 314, 7, 118, 2, 2, 314, 315, 7, 123, 2, 2, 315, 68, 3, 2, 2, 2, 316, 317, 7, 107, 2, 2, 317, 318, 7, 117, 2, 2, 318, 319, 7, 80, 2, 2, 319, 320, 7, 113, 2, 2, 320, 321, 7, 118, 2, 2, 321, 322, 7, 71, 2, 2, 322, 323, 7, 111, 2, 2, 323, 324, 7, 114, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 123, 2, 2, 326, 70, 3, 2, 2, 2, 327, 328, 7, 112, 2, 2, 328, 329, 7, 113, 2, 2, 329, 330, 7, 118, 2, 2, 330, 331, 7, 71, 2, 2, 331, 332, 7, 111, 2, 2, 332, 333, 7, 114, 2, 2, 333, 334, 7, 118, 2, 2, 334, 335, 7, 123, 2, 2, 335, 72, 3, 2, 2, 2, 336, 337, 7, 110, 2, 2, 337, 338, 7, 107, 2, 2, 338, 339, 7, 109, 2, 2, 339, 340, 7, 103, 2, 2, 340, 74, 3, 2, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 110, 2, 2, 343, 344, 7, 107, 2, 2, 344, 345, 7, 109, 2, 2, 345, 346, 7, 103, 2, 2, 346, 76, 3, 2, 2, 2, 347, 348, 7, 101, 2, 2, 348, 349, 7, 113, 2, 2, 349, 350, 7, 112, 2, 2, 350, 351, 7, 118, 2, 2, 351, 352, 7, 99, 2, 2, 352, 353, 7, 107, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 117, 2, 2, 355, 78, 3, 2, 2, 2, 356, 357, 7, 107, 2, 2, 357, 358, 7, 101, 2, 2, 358, 359, 7, 113, 2, 2, 359, 360, 7, 112, 2, 2, 360, 361, 7, 118, 2, 2, 361, 362, 7, 99, 2, 2, 362, 363, 7, 107, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 117, 2, 2, 365, 80, 3, 2, 2, 2, 366, 367, 7, 117, 2, 2, 367, 368, 7, 118, 2, 2, 368, 369, 7, 99, 2, 2, 369, 370, 7, 116, 2, 2, 370, 371, 7, 118, 2, 2, 371, 372, 7, 117, 2, 2, 372, 373, 7, 89, 2, 2, 373, 374, 7, 107, 2, 2, 374, 375, 7, 118, 2, 2, 375, 376, 7, 106, 2, 2, 376, 82, 3, 2, 2, 2, 377, 378, 7, 107, 2, 2, 378, 379, 7, 117, 2, 2, 379, 380, 7, 118, 2, 2, 380, 381, 7, 99, 2, 2, 381, 382, 7, 116, 2, 2, 382, 383, 7, 118, 2, 2, 383, 384, 7, 117, 2, 2, 384, 385, 7, 89, 2, 2, 385, 386, 7, 107, 2, 2, 386, 387, 7, 118, 2, 2, 387, 388, 7, 106, 2, 2, 388, 84, 3, 2, 2, 2, 389, 390, 7, 103, 2, 2, 390, 391, 7, 112, 2, 2, 391, 392, 7, 102, 2, 2, 392, 393, 7, 117, 2, 2, 393, 394, 7, 89, 2, 2, 394, 395, 7, 107, 2, 2, 395, 396, 7, 118, 2, 2, 396, 397, 7, 106, 2, 2, 397, 86, 3, 2, 2, 2, 398, 399, 7, 107, 2, 2, 399, 400, 7, 103, 2, 2, 400, 401, 7, 112, 2, 2, 401, 402, 7, 102, 2, 2, 402, 403, 7, 117, 2, 2, 403, 404, 7, 89, 2, 2, 404, 405, 7, 107, 2, 2, 405, 406, 7, 118, 2, 2, 406, 407, 7, 106, 2, 2, 407, 88, 3, 2, 2, 2, 408, 409, 7, 63, 2, 2, 409, 90, 3, 2, 2, 2, 410, 411, 7, 103, 2, 2, 411, 412, 7, 115, 2, 2, 412, 92, 3, 2, 2, 2, 413, 414, 7, 64, 2, 2, 414, 94, 3, 2, 2, 2, 415, 416, 7, 105, 2, 2, 416, 417, 7, 118, 2, 2, 417, 96, 3, 2, 2, 2, 418, 419, 7, 64, 2, 2, 419, 420, 7, 63, 2, 2, 420, 98, 3, 2, 2, 2, 421, 422, 7, 105, 2, 2, 422, 423, 7, 103, 2, 2, 423, 100, 3, 2, 2, 2, 424, 425, 7, 105, 2, 2, 425, 426, 7, 118, 2, 2, 426, 427, 7, 103, 2, 2, 427, 102, 3, 2, 2, 2, 428, 429, 7, 62, 2, 2, 429, 104, 3, 2, 2, 2, 430, 431, 7, 110, 2, 2, 431, 432, 7, 118, 2, 2, 432, 106, 3, 2, 2, 2, 433, 434, 7, 62, 2, 2, 434, 435, 7, 63, 2, 2, 435, 108, 3, 2, 2, 2, 436, 437, 7, 110, 2, 2, 437, 438, 7, 103, 2, 2, 438, 110, 3, 2, 2, 2, 439, 440, 7, 110, 2, 2, 440, 441, 7, 118, 2, 2, 441, 442, 7, 103, 2, 2, 442, 112, 3, 2, 2, 2, 443, 444, 7, 62, 2, 2, 444, 445, 7, 64, 2, 2, 445, 114, 3, 2, 2, 2, 446, 447, 7, 35, 2, 2, 447, 448, 7, 63, 2, 2, 448, 116, 3, 2, 2, 2, 449, 450, 7, 112, 2, 2, 450, 451, 7, 103, 2, 2, 451, 118, 3, 2, 2, 2, 452, 453, 7, 107, 2, 2, 453, 454, 7, 103, 2, 2, 454, 455, 7, 115, 2, 2, 455, 120, 3, 2, 2, 2, 456, 457, 7, 107, 2, 2, 457, 458, 7, 112, 2, 2, 458, 459, 7, 103, 2, 2, 459, 122, 3, 2, 2, 2, 460, 461, 7, 60, 2, 2, 461, 465, 9, 2, 2, 2, 462, 464, 9, 3, 2, 2, 463, 462, 3, 2, 2, 2, 464, 467, 3, 2, 2, 2, 465, 463, 3, 2, 2, 2, 465, 466, 3, 2, 2, 2, 466, 124, 3, 2, 2, 2, 467, 465, 3, 2, 2, 2, 468, 472, 9, 2, 2, 2, 469, 471, 9, 4, 2, 2, 470, 469, 3, 2, 2, 2, 471, 474, 3, 2, 2, 2, 472, 470, 3, 2, 2, 2, 472, 473, 3, 2, 2, 2, 473, 126, 3, 2, 2, 2, 474, 472, 3, 2, 2, 2, 475, 476, 7, 118, 2, 2, 476, 477, 7, 116, 2, 2, 477, 478, 7, 119, 2, 2, 478, 485, 7, 103, 2, 2, 479, 480, 7, 104, 2, 2, 480, 481, 7, 99, 2, 2, 481, 482, 7, 110, 2, 2, 482, 483, 7, 117, 2, 2, 483, 485, 7, 103, 2, 2, 484, 475, 3, 2, 2, 2, 484, 479, 3, 2, 2, 2, 485, 128, 3, 2, 2, 2, 486, 488, 7, 47, 2, 2, 487, 486, 3, 2, 2, 2, 487, 488, 3, 2, 2, 2, 488, 489, 3, 2, 2, 2, 489, 496, 5, 131, 66, 2, 490, 492, 7, 47, 2, 2, 491, 490, 3, 2, 2, 2, 491, 492, 3, 2, 2, 2, 492, 493, 3, 2, 2, 2, 493, 496, 5, 133, 67, 2, 494, 496, 5, 135, 68, 2, 495, 487, 3, 2, 2, 2, 495, 491, 3, 2, 2, 2, 495, 494, 3, 2, 2, 2, 496, 130, 3, 2, 2, 2, 497, 499, 9, 5, 2, 2, 498, 497, 3, 2, 2, 2, 499, 500, 3, 2, 2, 2, 500, 498, 3, 2, 2, 2, 500, 501, 3, 2, 2, 2, 501, 502, 3, 2, 2, 2, 502, 506, 7, 48, 2, 2, 503, 505, 9, 5, 2, 2, 504, 503, 3, 2, 2, 2, 505, 508, 3, 2, 2, 2, 506, 504, 3, 2, 2, 2, 506, 507, 3, 2, 2, 2, 507, 132, 3, 2, 2, 2, 508, 506, 3, 2, 2, 2, 509, 513, 9, 6, 2, 2, 510, 512, 9, 5, 2, 2, 511, 510, 3, 2, 2, 2, 512, 515, 3, 2, 2, 2, 513, 511, 3, 2, 2, 2, 513, 514, 3, 2, 2, 2, 514, 134, 3, 2, 2, 2, 515, 513, 3, 2, 2, 2, 516, 517, 7, 50, 2, 2, 517, 136, 3, 2, 2, 2, 518, 524, 7, 41, 2, 2, 519, 523, 10, 7, 2, 2, 520, 521, 7, 41, 2, 2, 521, 523, 7, 41, 2, 2, 522, 519, 3, 2, 2, 2, 522, 520, 3, 2, 2, 2, 523, 526, 3, 2, 2, 2, 524, 522, 3, 2, 2, 2, 524, 525, 3, 2, 2, 2, 525, 527, 3, 2, 2, 2, 526, 524, 3, 2, 2, 2, 527, 528, 7, 41, 2, 2, 528, 138, 3, 2, 2, 2, 529, 530, 9, 8, 2, 2, 530, 531, 3, 2, 2, 2, 531, 532, 8, 70, 2, 2, 532, 140, 3, 2, 2, 2, 14, 2, 465, 472, 484, 487, 491, 495, 500, 506, 513, 522, 524, 3, 8, 2, 2]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 73, 585, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 7, 62, 468, 10, 62, 12, 62, 14, 62, 471, 11, 62, 3, 63, 3, 63, 7, 63, 475, 10, 63, 12, 63, 14, 63, 478, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 526, 10, 65, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 5, 66, 537, 10, 66, 3, 67, 5, 67, 540, 10, 67, 3, 67, 3, 67, 5, 67, 544, 10, 67, 3, 67, 3, 67, 5, 67, 548, 10, 67, 3, 68, 6, 68, 551, 10, 68, 13, 68, 14, 68, 552, 3, 68, 3, 68, 7, 68, 557, 10, 68, 12, 68, 14, 68, 560, 11, 68, 3, 69, 3, 69, 7, 69, 564, 10, 69, 12, 69, 14, 69, 567, 11, 69, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 7, 71, 575, 10, 71, 12, 71, 14, 71, 578, 11, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 2, 2, 73, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 64, 127, 65, 129, 66, 131, 67, 133, 68, 135, 69, 137, 70, 139, 71, 141, 72, 143, 73, 3, 2, 9, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 7, 2, 48, 48, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 50, 59, 3, 2, 51, 59, 3, 2, 41, 41, 5, 2, 11, 12, 15, 15, 34, 34, 2, 600, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 3, 145, 3, 2, 2, 2, 5, 147, 3, 2, 2, 2, 7, 149, 3, 2, 2, 2, 9, 156, 3, 2, 2, 2, 11, 165, 3, 2, 2, 2, 13, 171, 3, 2, 2, 2, 15, 177, 3, 2, 2, 2, 17, 180, 3, 2, 2, 2, 19, 182, 3, 2, 2, 2, 21, 188, 3, 2, 2, 2, 23, 194, 3, 2, 2, 2, 25, 199, 3, 2, 2, 2, 27, 203, 3, 2, 2, 2, 29, 208, 3, 2, 2, 2, 31, 214, 3, 2, 2, 2, 33, 221, 3, 2, 2, 2, 35, 227, 3, 2, 2, 2, 37, 229, 3, 2, 2, 2, 39, 235, 3, 2, 2, 2, 41, 240, 3, 2, 2, 2, 43, 243, 3, 2, 2, 2, 45, 247, 3, 2, 2, 2, 47, 251, 3, 2, 2, 2, 49, 254, 3, 2, 2, 2, 51, 262, 3, 2, 2, 2, 53, 270, 3, 2, 2, 2, 55, 273, 3, 2, 2, 2, 57, 276, 3, 2, 2, 2, 59, 281, 3, 2, 2, 2, 61, 288, 3, 2, 2, 2, 63, 298, 3, 2, 2, 2, 65, 306, 3, 2, 2, 2, 67, 312, 3, 2, 2, 2, 69, 320, 3, 2, 2, 2, 71, 331, 3, 2, 2, 2, 73, 340, 3, 2, 2, 2, 75, 345, 3, 2, 2, 2, 77, 351, 3, 2, 2, 2, 79, 360, 3, 2, 2, 2, 81, 370, 3, 2, 2, 2, 83, 381, 3, 2, 2, 2, 85, 393, 3, 2, 2, 2, 87, 402, 3, 2, 2, 2, 89, 412, 3, 2, 2, 2, 91, 414, 3, 2, 2, 2, 93, 417, 3, 2, 2, 2, 95, 419, 3, 2, 2, 2, 97, 422, 3, 2, 2, 2, 99, 425, 3, 2, 2, 2, 101, 428, 3, 2, 2, 2, 103, 432, 3, 2, 2, 2, 105, 434, 3, 2, 2, 2, 107, 437, 3, 2, 2, 2, 109, 440, 3, 2, 2, 2, 111, 443, 3, 2, 2, 2, 113, 447, 3, 2, 2, 2, 115, 450, 3, 2, 2, 2, 117, 453, 3, 2, 2, 2, 119, 456, 3, 2, 2, 2, 121, 460, 3, 2, 2, 2, 123, 464, 3, 2, 2, 2, 125, 472, 3, 2, 2, 2, 127, 479, 3, 2, 2, 2, 129, 525, 3, 2, 2, 2, 131, 536, 3, 2, 2, 2, 133, 547, 3, 2, 2, 2, 135, 550, 3, 2, 2, 2, 137, 561, 3, 2, 2, 2, 139, 568, 3, 2, 2, 2, 141, 570, 3, 2, 2, 2, 143, 581, 3, 2, 2, 2, 145, 146, 7, 42, 2, 2, 146, 4, 3, 2, 2, 2, 147, 148, 7, 43, 2, 2, 148, 6, 3, 2, 2, 2, 149, 150, 7, 117, 2, 2, 150, 151, 7, 103, 2, 2, 151, 152, 7, 110, 2, 2, 152, 153, 7, 103, 2, 2, 153, 154, 7, 101, 2, 2, 154, 155, 7, 118, 2, 2, 155, 8, 3, 2, 2, 2, 156, 157, 7, 102, 2, 2, 157, 158, 7, 107, 2, 2, 158, 159, 7, 117, 2, 2, 159, 160, 7, 118, 2, 2, 160, 161, 7, 107, 2, 2, 161, 162, 7, 112, 2, 2, 162, 163, 7, 101, 2, 2, 163, 164, 7, 118, 2, 2, 164, 10, 3, 2, 2, 2, 165, 166, 7, 121, 2, 2, 166, 167, 7, 106, 2, 2, 167, 168, 7, 103, 2, 2, 168, 169, 7, 116, 2, 2, 169, 170, 7, 103, 2, 2, 170, 12, 3, 2, 2, 2, 171, 172, 7, 113, 2, 2, 172, 173, 7, 116, 2, 2, 173, 174, 7, 102, 2, 2, 174, 175, 7, 103, 2, 2, 175, 176, 7, 116, 2, 2, 176, 14, 3, 2, 2, 2, 177, 178, 7, 100, 2, 2, 178, 179, 7, 123, 2, 2, 179, 16, 3, 2, 2, 2, 180, 181, 7, 46, 2, 2, 181, 18, 3, 2, 2, 2, 182, 183, 7, 112, 2, 2, 183, 184, 7, 119, 2, 2, 184, 185, 7, 110, 2, 2, 185, 186, 7, 110, 2, 2, 186, 187, 7, 117, 2, 2, 187, 20, 3, 2, 2, 2, 188, 189, 7, 104, 2, 2, 189, 190, 7, 107, 2, 2, 190, 191, 7, 116, 2, 2, 191, 192, 7, 117, 2, 2, 192, 193, 7, 118, 2, 2, 193, 22, 3, 2, 2, 2, 194, 195, 7, 110, 2, 2, 195, 196, 7, 99, 2, 2, 196, 197, 7, 117, 2, 2, 197, 198, 7, 118, 2, 2, 198, 24, 3, 2, 2, 2, 199, 200, 7, 99, 2, 2, 200, 201, 7, 117, 2, 2, 201, 202, 7, 101, 2, 2, 202, 26, 3, 2, 2, 2, 203, 204, 7, 102, 2, 2, 204, 205, 7, 103, 2, 2, 205, 206, 7, 117, 2, 2, 206, 207, 7, 101, 2, 2, 207, 28, 3, 2, 2, 2, 208, 209, 7, 110, 2, 2, 209, 210, 7, 107, 2, 2, 210, 211, 7, 111, 2, 2, 211, 212, 7, 107, 2, 2, 212, 213, 7, 118, 2, 2, 213, 30, 3, 2, 2, 2, 214, 215, 7, 113, 2, 2, 215, 216, 7, 104, 2, 2, 216, 217, 7, 104, 2, 2, 217, 218, 7, 117, 2, 2, 218, 219, 7, 103, 2, 2, 219, 220, 7, 118, 2, 2, 220, 32, 3, 2, 2, 2, 221, 222, 7, 104, 2, 2, 222, 223, 7, 103, 2, 2, 223, 224, 7, 118, 2, 2, 224, 225, 7, 101, 2, 2, 225, 226, 7, 106, 2, 2, 226, 34, 3, 2, 2, 2, 227, 228, 7, 45, 2, 2, 228, 36, 3, 2, 2, 2, 229, 230, 7, 115, 2, 2, 230, 231, 7, 119, 2, 2, 231, 232, 7, 103, 2, 2, 232, 233, 7, 116, 2, 2, 233, 234, 7, 123, 2, 2, 234, 38, 3, 2, 2, 2, 235, 236, 7, 110, 2, 2, 236, 237, 7, 99, 2, 2, 237, 238, 7, 124, 2, 2, 238, 239, 7, 123, 2, 2, 239, 40, 3, 2, 2, 2, 240, 241, 7, 113, 2, 2, 241, 242, 7, 116, 2, 2, 242, 42, 3, 2, 2, 2, 243, 244, 7, 99, 2, 2, 244, 245, 7, 112, 2, 2, 245, 246, 7, 102, 2, 2, 246, 44, 3, 2, 2, 2, 247, 248, 7, 112, 2, 2, 248, 249, 7, 113, 2, 2, 249, 250, 7, 118, 2, 2, 250, 46, 3, 2, 2, 2, 251, 252, 7, 107, 2, 2, 252, 253, 7, 112, 2, 2, 253, 48, 3, 2, 2, 2, 254, 255, 7, 100, 2, 2, 255, 256, 7, 103, 2, 2, 256, 257, 7, 118, 2, 2, 257, 258, 7, 121, 2, 2, 258, 259, 7, 103, 2, 2, 259, 260, 7, 103, 2, 2, 260, 261, 7, 112, 2, 2, 261, 50, 3, 2, 2, 2, 262, 263, 7, 107, 2, 2, 263, 264, 7, 112, 2, 2, 264, 265, 7, 116, 2, 2, 265, 266, 7, 99, 2, 2, 266, 267, 7, 112, 2, 2, 267, 268, 7, 105, 2, 2, 268, 269, 7, 103, 2, 2, 269, 52, 3, 2, 2, 2, 270, 271, 7, 118, 2, 2, 271, 272, 7, 113, 2, 2, 272, 54, 3, 2, 2, 2, 273, 274, 7, 107, 2, 2, 274, 275, 7, 117, 2, 2, 275, 56, 3, 2, 2, 2, 276, 277, 7, 112, 2, 2, 277, 278, 7, 119, 2, 2, 278, 279, 7, 110, 2, 2, 279, 280, 7, 110, 2, 2, 280, 58, 3, 2, 2, 2, 281, 282, 7, 107, 2, 2, 282, 283, 7, 117, 2, 2, 283, 284, 7, 80, 2, 2, 284, 285, 7, 119, 2, 2, 285, 286, 7, 110, 2, 2, 286, 287, 7, 110, 2, 2, 287, 60, 3, 2, 2, 2, 288, 289, 7, 107, 2, 2, 289, 290, 7, 117, 2, 2, 290, 291, 7, 80, 2, 2, 291, 292, 7, 113, 2, 2, 292, 293, 7, 118, 2, 2, 293, 294, 7, 80, 2, 2, 294, 295, 7, 119, 2, 2, 295, 296, 7, 110, 2, 2, 296, 297, 7, 110, 2, 2, 297, 62, 3, 2, 2, 2, 298, 299, 7, 112, 2, 2, 299, 300, 7, 113, 2, 2, 300, 301, 7, 118, 2, 2, 301, 302, 7, 80, 2, 2, 302, 303, 7, 119, 2, 2, 303, 304, 7, 110, 2, 2, 304, 305, 7, 110, 2, 2, 305, 64, 3, 2, 2, 2, 306, 307, 7, 103, 2, 2, 307, 308, 7, 111, 2, 2, 308, 309, 7, 114, 2, 2, 309, 310, 7, 118, 2, 2, 310, 311, 7, 123, 2, 2, 311, 66, 3, 2, 2, 2, 312, 313, 7, 107, 2, 2, 313, 314, 7, 117, 2, 2, 314, 315, 7, 71, 2, 2, 315, 316, 7, 111, 2, 2, 316, 317, 7, 114, 2, 2, 317, 318, 7, 118, 2, 2, 318, 319, 7, 123, 2, 2, 319, 68, 3, 2, 2, 2, 320, 321, 7, 107, 2, 2, 321, 322, 7, 117, 2, 2, 322, 323, 7, 80, 2, 2, 323, 324, 7, 113, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 71, 2, 2, 326, 327, 7, 111, 2, 2, 327, 328, 7, 114, 2, 2, 328, 329, 7, 118, 2, 2, 329, 330, 7, 123, 2, 2, 330, 70, 3, 2, 2, 2, 331, 332, 7, 112, 2, 2, 332, 333, 7, 113, 2, 2, 333, 334, 7, 118, 2, 2, 334, 335, 7, 71, 2, 2, 335, 336, 7, 111, 2, 2, 336, 337, 7, 114, 2, 2, 337, 338, 7, 118, 2, 2, 338, 339, 7, 123, 2, 2, 339, 72, 3, 2, 2, 2, 340, 341, 7, 110, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 109, 2, 2, 343, 344, 7, 103, 2, 2, 344, 74, 3, 2, 2, 2, 345, 346, 7, 107, 2, 2, 346, 347, 7, 110, 2, 2, 347, 348, 7, 107, 2, 2, 348, 349, 7, 109, 2, 2, 349, 350, 7, 103, 2, 2, 350, 76, 3, 2, 2, 2, 351, 352, 7, 101, 2, 2, 352, 353, 7, 113, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 118, 2, 2, 355, 356, 7, 99, 2, 2, 356, 357, 7, 107, 2, 2, 357, 358, 7, 112, 2, 2, 358, 359, 7, 117, 2, 2, 359, 78, 3, 2, 2, 2, 360, 361, 7, 107, 2, 2, 361, 362, 7, 101, 2, 2, 362, 363, 7, 113, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 118, 2, 2, 365, 366, 7, 99, 2, 2, 366, 367, 7, 107, 2, 2, 367, 368, 7, 112, 2, 2, 368, 369, 7, 117, 2, 2, 369, 80, 3, 2, 2, 2, 370, 371, 7, 117, 2, 2, 371, 372, 7, 118, 2, 2, 372, 373, 7, 99, 2, 2, 373, 374, 7, 116, 2, 2, 374, 375, 7, 118, 2, 2, 375, 376, 7, 117, 2, 2, 376, 377, 7, 89, 2, 2, 377, 378, 7, 107, 2, 2, 378, 379, 7, 118, 2, 2, 379, 380, 7, 106, 2, 2, 380, 82, 3, 2, 2, 2, 381, 382, 7, 107, 2, 2, 382, 383, 7, 117, 2, 2, 383, 384, 7, 118, 2, 2, 384, 385, 7, 99, 2, 2, 385, 386, 7, 116, 2, 2, 386, 387, 7, 118, 2, 2, 387, 388, 7, 117, 2, 2, 388, 389, 7, 89, 2, 2, 389, 390, 7, 107, 2, 2, 390, 391, 7, 118, 2, 2, 391, 392, 7, 106, 2, 2, 392, 84, 3, 2, 2, 2, 393, 394, 7, 103, 2, 2, 394, 395, 7, 112, 2, 2, 395, 396, 7, 102, 2, 2, 396, 397, 7, 117, 2, 2, 397, 398, 7, 89, 2, 2, 398, 399, 7, 107, 2, 2, 399, 400, 7, 118, 2, 2, 400, 401, 7, 106, 2, 2, 401, 86, 3, 2, 2, 2, 402, 403, 7, 107, 2, 2, 403, 404, 7, 103, 2, 2, 404, 405, 7, 112, 2, 2, 405, 406, 7, 102, 2, 2, 406, 407, 7, 117, 2, 2, 407, 408, 7, 89, 2, 2, 408, 409, 7, 107, 2, 2, 409, 410, 7, 118, 2, 2, 410, 411, 7, 106, 2, 2, 411, 88, 3, 2, 2, 2, 412, 413, 7, 63, 2, 2, 413, 90, 3, 2, 2, 2, 414, 415, 7, 103, 2, 2, 415, 416, 7, 115, 2, 2, 416, 92, 3, 2, 2, 2, 417, 418, 7, 64, 2, 2, 418, 94, 3, 2, 2, 2, 419, 420, 7, 105, 2, 2, 420, 421, 7, 118, 2, 2, 421, 96, 3, 2, 2, 2, 422, 423, 7, 64, 2, 2, 423, 424, 7, 63, 2, 2, 424, 98, 3, 2, 2, 2, 425, 426, 7, 105, 2, 2, 426, 427, 7, 103, 2, 2, 427, 100, 3, 2, 2, 2, 428, 429, 7, 105, 2, 2, 429, 430, 7, 118, 2, 2, 430, 431, 7, 103, 2, 2, 431, 102, 3, 2, 2, 2, 432, 433, 7, 62, 2, 2, 433, 104, 3, 2, 2, 2, 434, 435, 7, 110, 2, 2, 435, 436, 7, 118, 2, 2, 436, 106, 3, 2, 2, 2, 437, 438, 7, 62, 2, 2, 438, 439, 7, 63, 2, 2, 439, 108, 3, 2, 2, 2, 440, 441, 7, 110, 2, 2, 441, 442, 7, 103, 2, 2, 442, 110, 3, 2, 2, 2, 443, 444, 7, 110, 2, 2, 444, 445, 7, 118, 2, 2, 445, 446, 7, 103, 2, 2, 446, 112, 3, 2, 2, 2, 447, 448, 7, 62, 2, 2, 448, 449, 7, 64, 2, 2, 449, 114, 3, 2, 2, 2, 450, 451, 7, 35, 2, 2, 451, 452, 7, 63, 2, 2, 452, 116, 3, 2, 2, 2, 453, 454, 7, 112, 2, 2, 454, 455, 7, 103, 2, 2, 455, 118, 3, 2, 2, 2, 456, 457, 7, 107, 2, 2, 457, 458, 7, 103, 2, 2, 458, 459, 7, 115, 2, 2, 459, 120, 3, 2, 2, 2, 460, 461, 7, 107, 2, 2, 461, 462, 7, 112, 2, 2, 462, 463, 7, 103, 2, 2, 463, 122, 3, 2, 2, 2, 464, 465, 7, 60, 2, 2, 465, 469, 9, 2, 2, 2, 466, 468, 9, 3, 2, 2, 467, 466, 3, 2, 2, 2, 468, 471, 3, 2, 2, 2, 469, 467, 3, 2, 2, 2, 469, 470, 3, 2, 2, 2, 470, 124, 3, 2, 2, 2, 471, 469, 3, 2, 2, 2, 472, 476, 9, 2, 2, 2, 473, 475, 9, 4, 2, 2, 474, 473, 3, 2, 2, 2, 475, 478, 3, 2, 2, 2, 476, 474, 3, 2, 2, 2, 476, 477, 3, 2, 2, 2, 477, 126, 3, 2, 2, 2, 478, 476, 3, 2, 2, 2, 479, 480, 7, 98, 2, 2, 480, 481, 5, 125, 63, 2, 481, 482, 7, 98, 2, 2, 482, 128, 3, 2, 2, 2, 483, 484, 7, 117, 2, 2, 484, 485, 7, 119, 2, 2, 485, 486, 7, 111, 2, 2, 486, 487, 7, 42, 2, 2, 487, 488, 3, 2, 2, 2, 488, 489, 5, 125, 63, 2, 489, 490, 7, 43, 2, 2, 490, 526, 3, 2, 2, 2, 491, 492, 7, 111, 2, 2, 492, 493, 7, 99, 2, 2, 493, 494, 7, 122, 2, 2, 494, 495, 7, 42, 2, 2, 495, 496, 3, 2, 2, 2, 496, 497, 5, 125, 63, 2, 497, 498, 7, 43, 2, 2, 498, 526, 3, 2, 2, 2, 499, 500, 7, 111, 2, 2, 500, 501, 7, 107, 2, 2, 501, 502, 7, 112, 2, 2, 502, 503, 7, 42, 2, 2, 503, 504, 3, 2, 2, 2, 504, 505, 5, 125, 63, 2, 505, 506, 7, 43, 2, 2, 506, 526, 3, 2, 2, 2, 507, 508, 7, 99, 2, 2, 508, 509, 7, 120, 2, 2, 509, 510, 7, 105, 2, 2, 510, 511, 7, 42, 2, 2, 511, 512, 3, 2, 2, 2, 512, 513, 5, 125, 63, 2, 513, 514, 7, 43, 2, 2, 514, 526, 3, 2, 2, 2, 515, 516, 7, 101, 2, 2, 516, 517, 7, 113, 2, 2, 517, 518, 7, 119, 2, 2, 518, 519, 7, 112, 2, 2, 519, 520, 7, 118, 2, 2, 520, 521, 7, 42, 2, 2, 521, 522, 3, 2, 2, 2, 522, 523, 5, 125, 63, 2, 523, 524, 7, 43, 2, 2, 524, 526, 3, 2, 2, 2, 525, 483, 3, 2, 2, 2, 525, 491, 3, 2, 2, 2, 525, 499, 3, 2, 2, 2, 525, 507, 3, 2, 2, 2, 525, 515, 3, 2, 2, 2, 526, 130, 3, 2, 2, 2, 527, 528, 7, 118, 2, 2, 528, 529, 7, 116, 2, 2, 529, 530, 7, 119, 2, 2, 530, 537, 7, 103, 2, 2, 531, 532, 7, 104, 2, 2, 532, 533, 7, 99, 2, 2, 533, 534, 7, 110, 2, 2, 534, 535, 7, 117, 2, 2, 535, 537, 7, 103, 2, 2, 536, 527, 3, 2, 2, 2, 536, 531, 3, 2, 2, 2, 537, 132, 3, 2, 2, 2, 538, 540, 7, 47, 2, 2, 539, 538, 3, 2, 2, 2, 539, 540, 3, 2, 2, 2, 540, 541, 3, 2, 2, 2, 541, 548, 5, 135, 68, 2, 542, 544, 7, 47, 2, 2, 543, 542, 3, 2, 2, 2, 543, 544, 3, 2, 2, 2, 544, 545, 3, 2, 2, 2, 545, 548, 5, 137, 69, 2, 546, 548, 5, 139, 70, 2, 547, 539, 3, 2, 2, 2, 547, 543, 3, 2, 2, 2, 547, 546, 3, 2, 2, 2, 548, 134, 3, 2, 2, 2, 549, 551, 9, 5, 2, 2, 550, 549, 3, 2, 2, 2, 551, 552, 3, 2, 2, 2, 552, 550, 3, 2, 2, 2, 552, 553, 3, 2, 2, 2, 553, 554, 3, 2, 2, 2, 554, 558, 7, 48, 2, 2, 555, 557, 9, 5, 2, 2, 556, 555, 3, 2, 2, 2, 557, 560, 3, 2, 2, 2, 558, 556, 3, 2, 2, 2, 558, 559, 3, 2, 2, 2, 559, 136, 3, 2, 2, 2, 560, 558, 3, 2, 2, 2, 561, 565, 9, 6, 2, 2, 562, 564, 9, 5, 2, 2, 563, 562, 3, 2, 2, 2, 564, 567, 3, 2, 2, 2, 565, 563, 3, 2, 2, 2, 565, 566, 3, 2, 2, 2, 566, 138, 3, 2, 2, 2, 567, 565, 3, 2, 2, 2, 568, 569, 7, 50, 2, 2, 569, 140, 3, 2, 2, 2, 570, 576, 7, 41, 2, 2, 571, 575, 10, 7, 2, 2, 572, 573, 7, 41, 2, 2, 573, 575, 7, 41, 2, 2, 574, 571, 3, 2, 2, 2, 574, 572, 3, 2, 2, 2, 575, 578, 3, 2, 2, 2, 576, 574, 3, 2, 2, 2, 576, 577, 3, 2, 2, 2, 577, 579, 3, 2, 2, 2, 578, 576, 3, 2, 2, 2, 579, 580, 7, 41, 2, 2, 580, 142, 3, 2, 2, 2, 581, 582, 9, 8, 2, 2, 582, 583, 3, 2, 2, 2, 583, 584, 8, 72, 2, 2, 584, 144, 3, 2, 2, 2, 15, 2, 469, 476, 525, 536, 539, 543, 547, 552, 558, 565, 574, 576, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index e67271b29..f0d4414a5 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -28,8 +28,9 @@ public class EQLLexer extends Lexer {
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
 		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
 		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
-		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, BOOLEAN_LITERAL=63, NUMBER_LITERAL=64,
-		DOUBLE=65, INT=66, ZERO=67, STRING_LITERAL=68, WS=69;
+		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, QUOTED_PATH_VARIABLE=63,
+		PROP_FORMULA=64, BOOLEAN_LITERAL=65, NUMBER_LITERAL=66, DOUBLE=67, INT=68,
+		ZERO=69, STRING_LITERAL=70, WS=71;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
@@ -47,15 +48,16 @@ public class EQLLexer extends Lexer {
 			"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40",
 			"T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48",
 			"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
-			"T__57", "T__58", "T__59", "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
-			"NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+			"T__57", "T__58", "T__59", "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE",
+			"PROP_FORMULA", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
+			"ZERO", "STRING_LITERAL", "WS"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
+			null, "'('", "')'", "'select'", "'distinct'", "'where'", "'order'", "'by'",
 			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
 			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
 			"'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'", "'isNull'",
@@ -63,7 +65,7 @@ public class EQLLexer extends Lexer {
 			"'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'", "'istartsWith'",
 			"'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'",
 			"'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'",
-			"'ieq'", "'ine'", null, null, null, null, null, null, "'0'"
+			"'ieq'", "'ine'", null, null, null, null, null, null, null, null, "'0'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -74,8 +76,9 @@ public class EQLLexer extends Lexer {
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
-			null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
-			"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+			null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA",
+			"BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL",
+			"WS"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -137,7 +140,7 @@ public class EQLLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2G\u0215\b\1\4\2\t"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2I\u0249\b\1\4\2\t"+
 		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
 		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
@@ -145,170 +148,188 @@ public class EQLLexer extends Lexer {
 		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
 		",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
 		"\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="+
-		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\3\2\3\2\3\2\3\2"+
-		"\3\2\3\2\3\2\3\3\3\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3"+
-		"\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n"+
-		"\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r"+
-		"\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3"+
-		"\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3"+
-		"\22\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3"+
-		"\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3"+
-		"\31\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3"+
-		"\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\36\3\36\3\36\3"+
-		"\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3"+
-		" \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3"+
-		"\"\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3$\3$\3$\3%\3%\3"+
-		"%\3%\3%\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3"+
-		"(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3*\3*\3*\3*\3"+
-		"*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3+\3+\3,\3,\3,\3,\3,\3,\3"+
-		",\3,\3,\3,\3-\3-\3.\3.\3.\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\62\3\62"+
-		"\3\62\3\63\3\63\3\63\3\63\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\67"+
-		"\3\67\3\67\38\38\38\38\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3<\3<\3=\3=\3"+
-		"=\3=\3>\3>\3>\7>\u01d0\n>\f>\16>\u01d3\13>\3?\3?\7?\u01d7\n?\f?\16?\u01da"+
-		"\13?\3@\3@\3@\3@\3@\3@\3@\3@\3@\5@\u01e5\n@\3A\5A\u01e8\nA\3A\3A\5A\u01ec"+
-		"\nA\3A\3A\5A\u01f0\nA\3B\6B\u01f3\nB\rB\16B\u01f4\3B\3B\7B\u01f9\nB\f"+
-		"B\16B\u01fc\13B\3C\3C\7C\u0200\nC\fC\16C\u0203\13C\3D\3D\3E\3E\3E\3E\7"+
-		"E\u020b\nE\fE\16E\u020e\13E\3E\3E\3F\3F\3F\3F\2\2G\3\3\5\4\7\5\t\6\13"+
-		"\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'"+
-		"\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'"+
-		"M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177"+
-		"A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\3\2\t\5\2C\\aac|\6\2\62;C"+
-		"\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"\2"+
-		"\u0220\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2"+
-		"\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3"+
-		"\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2"+
-		"\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2"+
-		"/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2"+
-		"\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2"+
-		"G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3"+
-		"\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2"+
-		"\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2"+
-		"m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3"+
-		"\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2"+
-		"\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\3"+
-		"\u008d\3\2\2\2\5\u0094\3\2\2\2\7\u0096\3\2\2\2\t\u0098\3\2\2\2\13\u00a1"+
-		"\3\2\2\2\r\u00a7\3\2\2\2\17\u00ad\3\2\2\2\21\u00b0\3\2\2\2\23\u00b2\3"+
-		"\2\2\2\25\u00b8\3\2\2\2\27\u00be\3\2\2\2\31\u00c3\3\2\2\2\33\u00c7\3\2"+
-		"\2\2\35\u00cc\3\2\2\2\37\u00d2\3\2\2\2!\u00d9\3\2\2\2#\u00df\3\2\2\2%"+
-		"\u00e1\3\2\2\2\'\u00e7\3\2\2\2)\u00ec\3\2\2\2+\u00ef\3\2\2\2-\u00f3\3"+
-		"\2\2\2/\u00f7\3\2\2\2\61\u00fa\3\2\2\2\63\u0102\3\2\2\2\65\u010a\3\2\2"+
-		"\2\67\u010d\3\2\2\29\u0110\3\2\2\2;\u0115\3\2\2\2=\u011c\3\2\2\2?\u0126"+
-		"\3\2\2\2A\u012e\3\2\2\2C\u0134\3\2\2\2E\u013c\3\2\2\2G\u0147\3\2\2\2I"+
-		"\u0150\3\2\2\2K\u0155\3\2\2\2M\u015b\3\2\2\2O\u0164\3\2\2\2Q\u016e\3\2"+
-		"\2\2S\u0179\3\2\2\2U\u0185\3\2\2\2W\u018e\3\2\2\2Y\u0198\3\2\2\2[\u019a"+
-		"\3\2\2\2]\u019d\3\2\2\2_\u019f\3\2\2\2a\u01a2\3\2\2\2c\u01a5\3\2\2\2e"+
-		"\u01a8\3\2\2\2g\u01ac\3\2\2\2i\u01ae\3\2\2\2k\u01b1\3\2\2\2m\u01b4\3\2"+
-		"\2\2o\u01b7\3\2\2\2q\u01bb\3\2\2\2s\u01be\3\2\2\2u\u01c1\3\2\2\2w\u01c4"+
-		"\3\2\2\2y\u01c8\3\2\2\2{\u01cc\3\2\2\2}\u01d4\3\2\2\2\177\u01e4\3\2\2"+
-		"\2\u0081\u01ef\3\2\2\2\u0083\u01f2\3\2\2\2\u0085\u01fd\3\2\2\2\u0087\u0204"+
-		"\3\2\2\2\u0089\u0206\3\2\2\2\u008b\u0211\3\2\2\2\u008d\u008e\7u\2\2\u008e"+
-		"\u008f\7g\2\2\u008f\u0090\7n\2\2\u0090\u0091\7g\2\2\u0091\u0092\7e\2\2"+
-		"\u0092\u0093\7v\2\2\u0093\4\3\2\2\2\u0094\u0095\7*\2\2\u0095\6\3\2\2\2"+
-		"\u0096\u0097\7+\2\2\u0097\b\3\2\2\2\u0098\u0099\7f\2\2\u0099\u009a\7k"+
-		"\2\2\u009a\u009b\7u\2\2\u009b\u009c\7v\2\2\u009c\u009d\7k\2\2\u009d\u009e"+
-		"\7p\2\2\u009e\u009f\7e\2\2\u009f\u00a0\7v\2\2\u00a0\n\3\2\2\2\u00a1\u00a2"+
-		"\7y\2\2\u00a2\u00a3\7j\2\2\u00a3\u00a4\7g\2\2\u00a4\u00a5\7t\2\2\u00a5"+
-		"\u00a6\7g\2\2\u00a6\f\3\2\2\2\u00a7\u00a8\7q\2\2\u00a8\u00a9\7t\2\2\u00a9"+
-		"\u00aa\7f\2\2\u00aa\u00ab\7g\2\2\u00ab\u00ac\7t\2\2\u00ac\16\3\2\2\2\u00ad"+
-		"\u00ae\7d\2\2\u00ae\u00af\7{\2\2\u00af\20\3\2\2\2\u00b0\u00b1\7.\2\2\u00b1"+
-		"\22\3\2\2\2\u00b2\u00b3\7p\2\2\u00b3\u00b4\7w\2\2\u00b4\u00b5\7n\2\2\u00b5"+
-		"\u00b6\7n\2\2\u00b6\u00b7\7u\2\2\u00b7\24\3\2\2\2\u00b8\u00b9\7h\2\2\u00b9"+
-		"\u00ba\7k\2\2\u00ba\u00bb\7t\2\2\u00bb\u00bc\7u\2\2\u00bc\u00bd\7v\2\2"+
-		"\u00bd\26\3\2\2\2\u00be\u00bf\7n\2\2\u00bf\u00c0\7c\2\2\u00c0\u00c1\7"+
-		"u\2\2\u00c1\u00c2\7v\2\2\u00c2\30\3\2\2\2\u00c3\u00c4\7c\2\2\u00c4\u00c5"+
-		"\7u\2\2\u00c5\u00c6\7e\2\2\u00c6\32\3\2\2\2\u00c7\u00c8\7f\2\2\u00c8\u00c9"+
-		"\7g\2\2\u00c9\u00ca\7u\2\2\u00ca\u00cb\7e\2\2\u00cb\34\3\2\2\2\u00cc\u00cd"+
-		"\7n\2\2\u00cd\u00ce\7k\2\2\u00ce\u00cf\7o\2\2\u00cf\u00d0\7k\2\2\u00d0"+
-		"\u00d1\7v\2\2\u00d1\36\3\2\2\2\u00d2\u00d3\7q\2\2\u00d3\u00d4\7h\2\2\u00d4"+
-		"\u00d5\7h\2\2\u00d5\u00d6\7u\2\2\u00d6\u00d7\7g\2\2\u00d7\u00d8\7v\2\2"+
-		"\u00d8 \3\2\2\2\u00d9\u00da\7h\2\2\u00da\u00db\7g\2\2\u00db\u00dc\7v\2"+
-		"\2\u00dc\u00dd\7e\2\2\u00dd\u00de\7j\2\2\u00de\"\3\2\2\2\u00df\u00e0\7"+
-		"-\2\2\u00e0$\3\2\2\2\u00e1\u00e2\7s\2\2\u00e2\u00e3\7w\2\2\u00e3\u00e4"+
-		"\7g\2\2\u00e4\u00e5\7t\2\2\u00e5\u00e6\7{\2\2\u00e6&\3\2\2\2\u00e7\u00e8"+
-		"\7n\2\2\u00e8\u00e9\7c\2\2\u00e9\u00ea\7|\2\2\u00ea\u00eb\7{\2\2\u00eb"+
-		"(\3\2\2\2\u00ec\u00ed\7q\2\2\u00ed\u00ee\7t\2\2\u00ee*\3\2\2\2\u00ef\u00f0"+
-		"\7c\2\2\u00f0\u00f1\7p\2\2\u00f1\u00f2\7f\2\2\u00f2,\3\2\2\2\u00f3\u00f4"+
-		"\7p\2\2\u00f4\u00f5\7q\2\2\u00f5\u00f6\7v\2\2\u00f6.\3\2\2\2\u00f7\u00f8"+
-		"\7k\2\2\u00f8\u00f9\7p\2\2\u00f9\60\3\2\2\2\u00fa\u00fb\7d\2\2\u00fb\u00fc"+
-		"\7g\2\2\u00fc\u00fd\7v\2\2\u00fd\u00fe\7y\2\2\u00fe\u00ff\7g\2\2\u00ff"+
-		"\u0100\7g\2\2\u0100\u0101\7p\2\2\u0101\62\3\2\2\2\u0102\u0103\7k\2\2\u0103"+
-		"\u0104\7p\2\2\u0104\u0105\7t\2\2\u0105\u0106\7c\2\2\u0106\u0107\7p\2\2"+
-		"\u0107\u0108\7i\2\2\u0108\u0109\7g\2\2\u0109\64\3\2\2\2\u010a\u010b\7"+
-		"v\2\2\u010b\u010c\7q\2\2\u010c\66\3\2\2\2\u010d\u010e\7k\2\2\u010e\u010f"+
-		"\7u\2\2\u010f8\3\2\2\2\u0110\u0111\7p\2\2\u0111\u0112\7w\2\2\u0112\u0113"+
-		"\7n\2\2\u0113\u0114\7n\2\2\u0114:\3\2\2\2\u0115\u0116\7k\2\2\u0116\u0117"+
-		"\7u\2\2\u0117\u0118\7P\2\2\u0118\u0119\7w\2\2\u0119\u011a\7n\2\2\u011a"+
-		"\u011b\7n\2\2\u011b<\3\2\2\2\u011c\u011d\7k\2\2\u011d\u011e\7u\2\2\u011e"+
-		"\u011f\7P\2\2\u011f\u0120\7q\2\2\u0120\u0121\7v\2\2\u0121\u0122\7P\2\2"+
-		"\u0122\u0123\7w\2\2\u0123\u0124\7n\2\2\u0124\u0125\7n\2\2\u0125>\3\2\2"+
-		"\2\u0126\u0127\7p\2\2\u0127\u0128\7q\2\2\u0128\u0129\7v\2\2\u0129\u012a"+
-		"\7P\2\2\u012a\u012b\7w\2\2\u012b\u012c\7n\2\2\u012c\u012d\7n\2\2\u012d"+
-		"@\3\2\2\2\u012e\u012f\7g\2\2\u012f\u0130\7o\2\2\u0130\u0131\7r\2\2\u0131"+
-		"\u0132\7v\2\2\u0132\u0133\7{\2\2\u0133B\3\2\2\2\u0134\u0135\7k\2\2\u0135"+
-		"\u0136\7u\2\2\u0136\u0137\7G\2\2\u0137\u0138\7o\2\2\u0138\u0139\7r\2\2"+
-		"\u0139\u013a\7v\2\2\u013a\u013b\7{\2\2\u013bD\3\2\2\2\u013c\u013d\7k\2"+
-		"\2\u013d\u013e\7u\2\2\u013e\u013f\7P\2\2\u013f\u0140\7q\2\2\u0140\u0141"+
-		"\7v\2\2\u0141\u0142\7G\2\2\u0142\u0143\7o\2\2\u0143\u0144\7r\2\2\u0144"+
-		"\u0145\7v\2\2\u0145\u0146\7{\2\2\u0146F\3\2\2\2\u0147\u0148\7p\2\2\u0148"+
-		"\u0149\7q\2\2\u0149\u014a\7v\2\2\u014a\u014b\7G\2\2\u014b\u014c\7o\2\2"+
-		"\u014c\u014d\7r\2\2\u014d\u014e\7v\2\2\u014e\u014f\7{\2\2\u014fH\3\2\2"+
-		"\2\u0150\u0151\7n\2\2\u0151\u0152\7k\2\2\u0152\u0153\7m\2\2\u0153\u0154"+
-		"\7g\2\2\u0154J\3\2\2\2\u0155\u0156\7k\2\2\u0156\u0157\7n\2\2\u0157\u0158"+
-		"\7k\2\2\u0158\u0159\7m\2\2\u0159\u015a\7g\2\2\u015aL\3\2\2\2\u015b\u015c"+
-		"\7e\2\2\u015c\u015d\7q\2\2\u015d\u015e\7p\2\2\u015e\u015f\7v\2\2\u015f"+
-		"\u0160\7c\2\2\u0160\u0161\7k\2\2\u0161\u0162\7p\2\2\u0162\u0163\7u\2\2"+
-		"\u0163N\3\2\2\2\u0164\u0165\7k\2\2\u0165\u0166\7e\2\2\u0166\u0167\7q\2"+
-		"\2\u0167\u0168\7p\2\2\u0168\u0169\7v\2\2\u0169\u016a\7c\2\2\u016a\u016b"+
-		"\7k\2\2\u016b\u016c\7p\2\2\u016c\u016d\7u\2\2\u016dP\3\2\2\2\u016e\u016f"+
-		"\7u\2\2\u016f\u0170\7v\2\2\u0170\u0171\7c\2\2\u0171\u0172\7t\2\2\u0172"+
-		"\u0173\7v\2\2\u0173\u0174\7u\2\2\u0174\u0175\7Y\2\2\u0175\u0176\7k\2\2"+
-		"\u0176\u0177\7v\2\2\u0177\u0178\7j\2\2\u0178R\3\2\2\2\u0179\u017a\7k\2"+
-		"\2\u017a\u017b\7u\2\2\u017b\u017c\7v\2\2\u017c\u017d\7c\2\2\u017d\u017e"+
-		"\7t\2\2\u017e\u017f\7v\2\2\u017f\u0180\7u\2\2\u0180\u0181\7Y\2\2\u0181"+
-		"\u0182\7k\2\2\u0182\u0183\7v\2\2\u0183\u0184\7j\2\2\u0184T\3\2\2\2\u0185"+
-		"\u0186\7g\2\2\u0186\u0187\7p\2\2\u0187\u0188\7f\2\2\u0188\u0189\7u\2\2"+
-		"\u0189\u018a\7Y\2\2\u018a\u018b\7k\2\2\u018b\u018c\7v\2\2\u018c\u018d"+
-		"\7j\2\2\u018dV\3\2\2\2\u018e\u018f\7k\2\2\u018f\u0190\7g\2\2\u0190\u0191"+
-		"\7p\2\2\u0191\u0192\7f\2\2\u0192\u0193\7u\2\2\u0193\u0194\7Y\2\2\u0194"+
-		"\u0195\7k\2\2\u0195\u0196\7v\2\2\u0196\u0197\7j\2\2\u0197X\3\2\2\2\u0198"+
-		"\u0199\7?\2\2\u0199Z\3\2\2\2\u019a\u019b\7g\2\2\u019b\u019c\7s\2\2\u019c"+
-		"\\\3\2\2\2\u019d\u019e\7@\2\2\u019e^\3\2\2\2\u019f\u01a0\7i\2\2\u01a0"+
-		"\u01a1\7v\2\2\u01a1`\3\2\2\2\u01a2\u01a3\7@\2\2\u01a3\u01a4\7?\2\2\u01a4"+
-		"b\3\2\2\2\u01a5\u01a6\7i\2\2\u01a6\u01a7\7g\2\2\u01a7d\3\2\2\2\u01a8\u01a9"+
-		"\7i\2\2\u01a9\u01aa\7v\2\2\u01aa\u01ab\7g\2\2\u01abf\3\2\2\2\u01ac\u01ad"+
-		"\7>\2\2\u01adh\3\2\2\2\u01ae\u01af\7n\2\2\u01af\u01b0\7v\2\2\u01b0j\3"+
-		"\2\2\2\u01b1\u01b2\7>\2\2\u01b2\u01b3\7?\2\2\u01b3l\3\2\2\2\u01b4\u01b5"+
-		"\7n\2\2\u01b5\u01b6\7g\2\2\u01b6n\3\2\2\2\u01b7\u01b8\7n\2\2\u01b8\u01b9"+
-		"\7v\2\2\u01b9\u01ba\7g\2\2\u01bap\3\2\2\2\u01bb\u01bc\7>\2\2\u01bc\u01bd"+
-		"\7@\2\2\u01bdr\3\2\2\2\u01be\u01bf\7#\2\2\u01bf\u01c0\7?\2\2\u01c0t\3"+
-		"\2\2\2\u01c1\u01c2\7p\2\2\u01c2\u01c3\7g\2\2\u01c3v\3\2\2\2\u01c4\u01c5"+
-		"\7k\2\2\u01c5\u01c6\7g\2\2\u01c6\u01c7\7s\2\2\u01c7x\3\2\2\2\u01c8\u01c9"+
-		"\7k\2\2\u01c9\u01ca\7p\2\2\u01ca\u01cb\7g\2\2\u01cbz\3\2\2\2\u01cc\u01cd"+
-		"\7<\2\2\u01cd\u01d1\t\2\2\2\u01ce\u01d0\t\3\2\2\u01cf\u01ce\3\2\2\2\u01d0"+
-		"\u01d3\3\2\2\2\u01d1\u01cf\3\2\2\2\u01d1\u01d2\3\2\2\2\u01d2|\3\2\2\2"+
-		"\u01d3\u01d1\3\2\2\2\u01d4\u01d8\t\2\2\2\u01d5\u01d7\t\4\2\2\u01d6\u01d5"+
-		"\3\2\2\2\u01d7\u01da\3\2\2\2\u01d8\u01d6\3\2\2\2\u01d8\u01d9\3\2\2\2\u01d9"+
-		"~\3\2\2\2\u01da\u01d8\3\2\2\2\u01db\u01dc\7v\2\2\u01dc\u01dd\7t\2\2\u01dd"+
-		"\u01de\7w\2\2\u01de\u01e5\7g\2\2\u01df\u01e0\7h\2\2\u01e0\u01e1\7c\2\2"+
-		"\u01e1\u01e2\7n\2\2\u01e2\u01e3\7u\2\2\u01e3\u01e5\7g\2\2\u01e4\u01db"+
-		"\3\2\2\2\u01e4\u01df\3\2\2\2\u01e5\u0080\3\2\2\2\u01e6\u01e8\7/\2\2\u01e7"+
-		"\u01e6\3\2\2\2\u01e7\u01e8\3\2\2\2\u01e8\u01e9\3\2\2\2\u01e9\u01f0\5\u0083"+
-		"B\2\u01ea\u01ec\7/\2\2\u01eb\u01ea\3\2\2\2\u01eb\u01ec\3\2\2\2\u01ec\u01ed"+
-		"\3\2\2\2\u01ed\u01f0\5\u0085C\2\u01ee\u01f0\5\u0087D\2\u01ef\u01e7\3\2"+
-		"\2\2\u01ef\u01eb\3\2\2\2\u01ef\u01ee\3\2\2\2\u01f0\u0082\3\2\2\2\u01f1"+
-		"\u01f3\t\5\2\2\u01f2\u01f1\3\2\2\2\u01f3\u01f4\3\2\2\2\u01f4\u01f2\3\2"+
-		"\2\2\u01f4\u01f5\3\2\2\2\u01f5\u01f6\3\2\2\2\u01f6\u01fa\7\60\2\2\u01f7"+
-		"\u01f9\t\5\2\2\u01f8\u01f7\3\2\2\2\u01f9\u01fc\3\2\2\2\u01fa\u01f8\3\2"+
-		"\2\2\u01fa\u01fb\3\2\2\2\u01fb\u0084\3\2\2\2\u01fc\u01fa\3\2\2\2\u01fd"+
-		"\u0201\t\6\2\2\u01fe\u0200\t\5\2\2\u01ff\u01fe\3\2\2\2\u0200\u0203\3\2"+
-		"\2\2\u0201\u01ff\3\2\2\2\u0201\u0202\3\2\2\2\u0202\u0086\3\2\2\2\u0203"+
-		"\u0201\3\2\2\2\u0204\u0205\7\62\2\2\u0205\u0088\3\2\2\2\u0206\u020c\7"+
-		")\2\2\u0207\u020b\n\7\2\2\u0208\u0209\7)\2\2\u0209\u020b\7)\2\2\u020a"+
-		"\u0207\3\2\2\2\u020a\u0208\3\2\2\2\u020b\u020e\3\2\2\2\u020c\u020a\3\2"+
-		"\2\2\u020c\u020d\3\2\2\2\u020d\u020f\3\2\2\2\u020e\u020c\3\2\2\2\u020f"+
-		"\u0210\7)\2\2\u0210\u008a\3\2\2\2\u0211\u0212\t\b\2\2\u0212\u0213\3\2"+
-		"\2\2\u0213\u0214\bF\2\2\u0214\u008c\3\2\2\2\16\2\u01d1\u01d8\u01e4\u01e7"+
-		"\u01eb\u01ef\u01f4\u01fa\u0201\u020a\u020c\3\b\2\2";
+		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\4E\tE\4F\tF\4G\tG\4H\tH\3\2"+
+		"\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3"+
+		"\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t"+
+		"\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f"+
+		"\3\f\3\f\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17"+
+		"\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21"+
+		"\3\21\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24"+
+		"\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30"+
+		"\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32"+
+		"\3\32\3\32\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\36"+
+		"\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37"+
+		"\3\37\3\37\3 \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3"+
+		"\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3$\3"+
+		"$\3$\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'"+
+		"\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3)\3"+
+		"*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3+\3+\3,\3,\3"+
+		",\3,\3,\3,\3,\3,\3,\3,\3-\3-\3.\3.\3.\3/\3/\3\60\3\60\3\60\3\61\3\61\3"+
+		"\61\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\64\3\64\3\65\3\65\3\65\3\66\3"+
+		"\66\3\66\3\67\3\67\3\67\38\38\38\38\39\39\39\3:\3:\3:\3;\3;\3;\3<\3<\3"+
+		"<\3<\3=\3=\3=\3=\3>\3>\3>\7>\u01d4\n>\f>\16>\u01d7\13>\3?\3?\7?\u01db"+
+		"\n?\f?\16?\u01de\13?\3@\3@\3@\3@\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3"+
+		"A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3A\3"+
+		"A\3A\3A\3A\3A\3A\3A\5A\u020e\nA\3B\3B\3B\3B\3B\3B\3B\3B\3B\5B\u0219\n"+
+		"B\3C\5C\u021c\nC\3C\3C\5C\u0220\nC\3C\3C\5C\u0224\nC\3D\6D\u0227\nD\r"+
+		"D\16D\u0228\3D\3D\7D\u022d\nD\fD\16D\u0230\13D\3E\3E\7E\u0234\nE\fE\16"+
+		"E\u0237\13E\3F\3F\3G\3G\3G\3G\7G\u023f\nG\fG\16G\u0242\13G\3G\3G\3H\3"+
+		"H\3H\3H\2\2I\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16"+
+		"\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34"+
+		"\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g"+
+		"\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F"+
+		"\u008bG\u008dH\u008fI\3\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\"+
+		"aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"\2\u0258\2\3\3\2\2\2\2\5"+
+		"\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2"+
+		"\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33"+
+		"\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2"+
+		"\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2"+
+		"\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2"+
+		"\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K"+
+		"\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2"+
+		"\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2"+
+		"\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q"+
+		"\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2"+
+		"\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087"+
+		"\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2"+
+		"\2\3\u0091\3\2\2\2\5\u0093\3\2\2\2\7\u0095\3\2\2\2\t\u009c\3\2\2\2\13"+
+		"\u00a5\3\2\2\2\r\u00ab\3\2\2\2\17\u00b1\3\2\2\2\21\u00b4\3\2\2\2\23\u00b6"+
+		"\3\2\2\2\25\u00bc\3\2\2\2\27\u00c2\3\2\2\2\31\u00c7\3\2\2\2\33\u00cb\3"+
+		"\2\2\2\35\u00d0\3\2\2\2\37\u00d6\3\2\2\2!\u00dd\3\2\2\2#\u00e3\3\2\2\2"+
+		"%\u00e5\3\2\2\2\'\u00eb\3\2\2\2)\u00f0\3\2\2\2+\u00f3\3\2\2\2-\u00f7\3"+
+		"\2\2\2/\u00fb\3\2\2\2\61\u00fe\3\2\2\2\63\u0106\3\2\2\2\65\u010e\3\2\2"+
+		"\2\67\u0111\3\2\2\29\u0114\3\2\2\2;\u0119\3\2\2\2=\u0120\3\2\2\2?\u012a"+
+		"\3\2\2\2A\u0132\3\2\2\2C\u0138\3\2\2\2E\u0140\3\2\2\2G\u014b\3\2\2\2I"+
+		"\u0154\3\2\2\2K\u0159\3\2\2\2M\u015f\3\2\2\2O\u0168\3\2\2\2Q\u0172\3\2"+
+		"\2\2S\u017d\3\2\2\2U\u0189\3\2\2\2W\u0192\3\2\2\2Y\u019c\3\2\2\2[\u019e"+
+		"\3\2\2\2]\u01a1\3\2\2\2_\u01a3\3\2\2\2a\u01a6\3\2\2\2c\u01a9\3\2\2\2e"+
+		"\u01ac\3\2\2\2g\u01b0\3\2\2\2i\u01b2\3\2\2\2k\u01b5\3\2\2\2m\u01b8\3\2"+
+		"\2\2o\u01bb\3\2\2\2q\u01bf\3\2\2\2s\u01c2\3\2\2\2u\u01c5\3\2\2\2w\u01c8"+
+		"\3\2\2\2y\u01cc\3\2\2\2{\u01d0\3\2\2\2}\u01d8\3\2\2\2\177\u01df\3\2\2"+
+		"\2\u0081\u020d\3\2\2\2\u0083\u0218\3\2\2\2\u0085\u0223\3\2\2\2\u0087\u0226"+
+		"\3\2\2\2\u0089\u0231\3\2\2\2\u008b\u0238\3\2\2\2\u008d\u023a\3\2\2\2\u008f"+
+		"\u0245\3\2\2\2\u0091\u0092\7*\2\2\u0092\4\3\2\2\2\u0093\u0094\7+\2\2\u0094"+
+		"\6\3\2\2\2\u0095\u0096\7u\2\2\u0096\u0097\7g\2\2\u0097\u0098\7n\2\2\u0098"+
+		"\u0099\7g\2\2\u0099\u009a\7e\2\2\u009a\u009b\7v\2\2\u009b\b\3\2\2\2\u009c"+
+		"\u009d\7f\2\2\u009d\u009e\7k\2\2\u009e\u009f\7u\2\2\u009f\u00a0\7v\2\2"+
+		"\u00a0\u00a1\7k\2\2\u00a1\u00a2\7p\2\2\u00a2\u00a3\7e\2\2\u00a3\u00a4"+
+		"\7v\2\2\u00a4\n\3\2\2\2\u00a5\u00a6\7y\2\2\u00a6\u00a7\7j\2\2\u00a7\u00a8"+
+		"\7g\2\2\u00a8\u00a9\7t\2\2\u00a9\u00aa\7g\2\2\u00aa\f\3\2\2\2\u00ab\u00ac"+
+		"\7q\2\2\u00ac\u00ad\7t\2\2\u00ad\u00ae\7f\2\2\u00ae\u00af\7g\2\2\u00af"+
+		"\u00b0\7t\2\2\u00b0\16\3\2\2\2\u00b1\u00b2\7d\2\2\u00b2\u00b3\7{\2\2\u00b3"+
+		"\20\3\2\2\2\u00b4\u00b5\7.\2\2\u00b5\22\3\2\2\2\u00b6\u00b7\7p\2\2\u00b7"+
+		"\u00b8\7w\2\2\u00b8\u00b9\7n\2\2\u00b9\u00ba\7n\2\2\u00ba\u00bb\7u\2\2"+
+		"\u00bb\24\3\2\2\2\u00bc\u00bd\7h\2\2\u00bd\u00be\7k\2\2\u00be\u00bf\7"+
+		"t\2\2\u00bf\u00c0\7u\2\2\u00c0\u00c1\7v\2\2\u00c1\26\3\2\2\2\u00c2\u00c3"+
+		"\7n\2\2\u00c3\u00c4\7c\2\2\u00c4\u00c5\7u\2\2\u00c5\u00c6\7v\2\2\u00c6"+
+		"\30\3\2\2\2\u00c7\u00c8\7c\2\2\u00c8\u00c9\7u\2\2\u00c9\u00ca\7e\2\2\u00ca"+
+		"\32\3\2\2\2\u00cb\u00cc\7f\2\2\u00cc\u00cd\7g\2\2\u00cd\u00ce\7u\2\2\u00ce"+
+		"\u00cf\7e\2\2\u00cf\34\3\2\2\2\u00d0\u00d1\7n\2\2\u00d1\u00d2\7k\2\2\u00d2"+
+		"\u00d3\7o\2\2\u00d3\u00d4\7k\2\2\u00d4\u00d5\7v\2\2\u00d5\36\3\2\2\2\u00d6"+
+		"\u00d7\7q\2\2\u00d7\u00d8\7h\2\2\u00d8\u00d9\7h\2\2\u00d9\u00da\7u\2\2"+
+		"\u00da\u00db\7g\2\2\u00db\u00dc\7v\2\2\u00dc \3\2\2\2\u00dd\u00de\7h\2"+
+		"\2\u00de\u00df\7g\2\2\u00df\u00e0\7v\2\2\u00e0\u00e1\7e\2\2\u00e1\u00e2"+
+		"\7j\2\2\u00e2\"\3\2\2\2\u00e3\u00e4\7-\2\2\u00e4$\3\2\2\2\u00e5\u00e6"+
+		"\7s\2\2\u00e6\u00e7\7w\2\2\u00e7\u00e8\7g\2\2\u00e8\u00e9\7t\2\2\u00e9"+
+		"\u00ea\7{\2\2\u00ea&\3\2\2\2\u00eb\u00ec\7n\2\2\u00ec\u00ed\7c\2\2\u00ed"+
+		"\u00ee\7|\2\2\u00ee\u00ef\7{\2\2\u00ef(\3\2\2\2\u00f0\u00f1\7q\2\2\u00f1"+
+		"\u00f2\7t\2\2\u00f2*\3\2\2\2\u00f3\u00f4\7c\2\2\u00f4\u00f5\7p\2\2\u00f5"+
+		"\u00f6\7f\2\2\u00f6,\3\2\2\2\u00f7\u00f8\7p\2\2\u00f8\u00f9\7q\2\2\u00f9"+
+		"\u00fa\7v\2\2\u00fa.\3\2\2\2\u00fb\u00fc\7k\2\2\u00fc\u00fd\7p\2\2\u00fd"+
+		"\60\3\2\2\2\u00fe\u00ff\7d\2\2\u00ff\u0100\7g\2\2\u0100\u0101\7v\2\2\u0101"+
+		"\u0102\7y\2\2\u0102\u0103\7g\2\2\u0103\u0104\7g\2\2\u0104\u0105\7p\2\2"+
+		"\u0105\62\3\2\2\2\u0106\u0107\7k\2\2\u0107\u0108\7p\2\2\u0108\u0109\7"+
+		"t\2\2\u0109\u010a\7c\2\2\u010a\u010b\7p\2\2\u010b\u010c\7i\2\2\u010c\u010d"+
+		"\7g\2\2\u010d\64\3\2\2\2\u010e\u010f\7v\2\2\u010f\u0110\7q\2\2\u0110\66"+
+		"\3\2\2\2\u0111\u0112\7k\2\2\u0112\u0113\7u\2\2\u01138\3\2\2\2\u0114\u0115"+
+		"\7p\2\2\u0115\u0116\7w\2\2\u0116\u0117\7n\2\2\u0117\u0118\7n\2\2\u0118"+
+		":\3\2\2\2\u0119\u011a\7k\2\2\u011a\u011b\7u\2\2\u011b\u011c\7P\2\2\u011c"+
+		"\u011d\7w\2\2\u011d\u011e\7n\2\2\u011e\u011f\7n\2\2\u011f<\3\2\2\2\u0120"+
+		"\u0121\7k\2\2\u0121\u0122\7u\2\2\u0122\u0123\7P\2\2\u0123\u0124\7q\2\2"+
+		"\u0124\u0125\7v\2\2\u0125\u0126\7P\2\2\u0126\u0127\7w\2\2\u0127\u0128"+
+		"\7n\2\2\u0128\u0129\7n\2\2\u0129>\3\2\2\2\u012a\u012b\7p\2\2\u012b\u012c"+
+		"\7q\2\2\u012c\u012d\7v\2\2\u012d\u012e\7P\2\2\u012e\u012f\7w\2\2\u012f"+
+		"\u0130\7n\2\2\u0130\u0131\7n\2\2\u0131@\3\2\2\2\u0132\u0133\7g\2\2\u0133"+
+		"\u0134\7o\2\2\u0134\u0135\7r\2\2\u0135\u0136\7v\2\2\u0136\u0137\7{\2\2"+
+		"\u0137B\3\2\2\2\u0138\u0139\7k\2\2\u0139\u013a\7u\2\2\u013a\u013b\7G\2"+
+		"\2\u013b\u013c\7o\2\2\u013c\u013d\7r\2\2\u013d\u013e\7v\2\2\u013e\u013f"+
+		"\7{\2\2\u013fD\3\2\2\2\u0140\u0141\7k\2\2\u0141\u0142\7u\2\2\u0142\u0143"+
+		"\7P\2\2\u0143\u0144\7q\2\2\u0144\u0145\7v\2\2\u0145\u0146\7G\2\2\u0146"+
+		"\u0147\7o\2\2\u0147\u0148\7r\2\2\u0148\u0149\7v\2\2\u0149\u014a\7{\2\2"+
+		"\u014aF\3\2\2\2\u014b\u014c\7p\2\2\u014c\u014d\7q\2\2\u014d\u014e\7v\2"+
+		"\2\u014e\u014f\7G\2\2\u014f\u0150\7o\2\2\u0150\u0151\7r\2\2\u0151\u0152"+
+		"\7v\2\2\u0152\u0153\7{\2\2\u0153H\3\2\2\2\u0154\u0155\7n\2\2\u0155\u0156"+
+		"\7k\2\2\u0156\u0157\7m\2\2\u0157\u0158\7g\2\2\u0158J\3\2\2\2\u0159\u015a"+
+		"\7k\2\2\u015a\u015b\7n\2\2\u015b\u015c\7k\2\2\u015c\u015d\7m\2\2\u015d"+
+		"\u015e\7g\2\2\u015eL\3\2\2\2\u015f\u0160\7e\2\2\u0160\u0161\7q\2\2\u0161"+
+		"\u0162\7p\2\2\u0162\u0163\7v\2\2\u0163\u0164\7c\2\2\u0164\u0165\7k\2\2"+
+		"\u0165\u0166\7p\2\2\u0166\u0167\7u\2\2\u0167N\3\2\2\2\u0168\u0169\7k\2"+
+		"\2\u0169\u016a\7e\2\2\u016a\u016b\7q\2\2\u016b\u016c\7p\2\2\u016c\u016d"+
+		"\7v\2\2\u016d\u016e\7c\2\2\u016e\u016f\7k\2\2\u016f\u0170\7p\2\2\u0170"+
+		"\u0171\7u\2\2\u0171P\3\2\2\2\u0172\u0173\7u\2\2\u0173\u0174\7v\2\2\u0174"+
+		"\u0175\7c\2\2\u0175\u0176\7t\2\2\u0176\u0177\7v\2\2\u0177\u0178\7u\2\2"+
+		"\u0178\u0179\7Y\2\2\u0179\u017a\7k\2\2\u017a\u017b\7v\2\2\u017b\u017c"+
+		"\7j\2\2\u017cR\3\2\2\2\u017d\u017e\7k\2\2\u017e\u017f\7u\2\2\u017f\u0180"+
+		"\7v\2\2\u0180\u0181\7c\2\2\u0181\u0182\7t\2\2\u0182\u0183\7v\2\2\u0183"+
+		"\u0184\7u\2\2\u0184\u0185\7Y\2\2\u0185\u0186\7k\2\2\u0186\u0187\7v\2\2"+
+		"\u0187\u0188\7j\2\2\u0188T\3\2\2\2\u0189\u018a\7g\2\2\u018a\u018b\7p\2"+
+		"\2\u018b\u018c\7f\2\2\u018c\u018d\7u\2\2\u018d\u018e\7Y\2\2\u018e\u018f"+
+		"\7k\2\2\u018f\u0190\7v\2\2\u0190\u0191\7j\2\2\u0191V\3\2\2\2\u0192\u0193"+
+		"\7k\2\2\u0193\u0194\7g\2\2\u0194\u0195\7p\2\2\u0195\u0196\7f\2\2\u0196"+
+		"\u0197\7u\2\2\u0197\u0198\7Y\2\2\u0198\u0199\7k\2\2\u0199\u019a\7v\2\2"+
+		"\u019a\u019b\7j\2\2\u019bX\3\2\2\2\u019c\u019d\7?\2\2\u019dZ\3\2\2\2\u019e"+
+		"\u019f\7g\2\2\u019f\u01a0\7s\2\2\u01a0\\\3\2\2\2\u01a1\u01a2\7@\2\2\u01a2"+
+		"^\3\2\2\2\u01a3\u01a4\7i\2\2\u01a4\u01a5\7v\2\2\u01a5`\3\2\2\2\u01a6\u01a7"+
+		"\7@\2\2\u01a7\u01a8\7?\2\2\u01a8b\3\2\2\2\u01a9\u01aa\7i\2\2\u01aa\u01ab"+
+		"\7g\2\2\u01abd\3\2\2\2\u01ac\u01ad\7i\2\2\u01ad\u01ae\7v\2\2\u01ae\u01af"+
+		"\7g\2\2\u01aff\3\2\2\2\u01b0\u01b1\7>\2\2\u01b1h\3\2\2\2\u01b2\u01b3\7"+
+		"n\2\2\u01b3\u01b4\7v\2\2\u01b4j\3\2\2\2\u01b5\u01b6\7>\2\2\u01b6\u01b7"+
+		"\7?\2\2\u01b7l\3\2\2\2\u01b8\u01b9\7n\2\2\u01b9\u01ba\7g\2\2\u01ban\3"+
+		"\2\2\2\u01bb\u01bc\7n\2\2\u01bc\u01bd\7v\2\2\u01bd\u01be\7g\2\2\u01be"+
+		"p\3\2\2\2\u01bf\u01c0\7>\2\2\u01c0\u01c1\7@\2\2\u01c1r\3\2\2\2\u01c2\u01c3"+
+		"\7#\2\2\u01c3\u01c4\7?\2\2\u01c4t\3\2\2\2\u01c5\u01c6\7p\2\2\u01c6\u01c7"+
+		"\7g\2\2\u01c7v\3\2\2\2\u01c8\u01c9\7k\2\2\u01c9\u01ca\7g\2\2\u01ca\u01cb"+
+		"\7s\2\2\u01cbx\3\2\2\2\u01cc\u01cd\7k\2\2\u01cd\u01ce\7p\2\2\u01ce\u01cf"+
+		"\7g\2\2\u01cfz\3\2\2\2\u01d0\u01d1\7<\2\2\u01d1\u01d5\t\2\2\2\u01d2\u01d4"+
+		"\t\3\2\2\u01d3\u01d2\3\2\2\2\u01d4\u01d7\3\2\2\2\u01d5\u01d3\3\2\2\2\u01d5"+
+		"\u01d6\3\2\2\2\u01d6|\3\2\2\2\u01d7\u01d5\3\2\2\2\u01d8\u01dc\t\2\2\2"+
+		"\u01d9\u01db\t\4\2\2\u01da\u01d9\3\2\2\2\u01db\u01de\3\2\2\2\u01dc\u01da"+
+		"\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd~\3\2\2\2\u01de\u01dc\3\2\2\2\u01df"+
+		"\u01e0\7b\2\2\u01e0\u01e1\5}?\2\u01e1\u01e2\7b\2\2\u01e2\u0080\3\2\2\2"+
+		"\u01e3\u01e4\7u\2\2\u01e4\u01e5\7w\2\2\u01e5\u01e6\7o\2\2\u01e6\u01e7"+
+		"\7*\2\2\u01e7\u01e8\3\2\2\2\u01e8\u01e9\5}?\2\u01e9\u01ea\7+\2\2\u01ea"+
+		"\u020e\3\2\2\2\u01eb\u01ec\7o\2\2\u01ec\u01ed\7c\2\2\u01ed\u01ee\7z\2"+
+		"\2\u01ee\u01ef\7*\2\2\u01ef\u01f0\3\2\2\2\u01f0\u01f1\5}?\2\u01f1\u01f2"+
+		"\7+\2\2\u01f2\u020e\3\2\2\2\u01f3\u01f4\7o\2\2\u01f4\u01f5\7k\2\2\u01f5"+
+		"\u01f6\7p\2\2\u01f6\u01f7\7*\2\2\u01f7\u01f8\3\2\2\2\u01f8\u01f9\5}?\2"+
+		"\u01f9\u01fa\7+\2\2\u01fa\u020e\3\2\2\2\u01fb\u01fc\7c\2\2\u01fc\u01fd"+
+		"\7x\2\2\u01fd\u01fe\7i\2\2\u01fe\u01ff\7*\2\2\u01ff\u0200\3\2\2\2\u0200"+
+		"\u0201\5}?\2\u0201\u0202\7+\2\2\u0202\u020e\3\2\2\2\u0203\u0204\7e\2\2"+
+		"\u0204\u0205\7q\2\2\u0205\u0206\7w\2\2\u0206\u0207\7p\2\2\u0207\u0208"+
+		"\7v\2\2\u0208\u0209\7*\2\2\u0209\u020a\3\2\2\2\u020a\u020b\5}?\2\u020b"+
+		"\u020c\7+\2\2\u020c\u020e\3\2\2\2\u020d\u01e3\3\2\2\2\u020d\u01eb\3\2"+
+		"\2\2\u020d\u01f3\3\2\2\2\u020d\u01fb\3\2\2\2\u020d\u0203\3\2\2\2\u020e"+
+		"\u0082\3\2\2\2\u020f\u0210\7v\2\2\u0210\u0211\7t\2\2\u0211\u0212\7w\2"+
+		"\2\u0212\u0219\7g\2\2\u0213\u0214\7h\2\2\u0214\u0215\7c\2\2\u0215\u0216"+
+		"\7n\2\2\u0216\u0217\7u\2\2\u0217\u0219\7g\2\2\u0218\u020f\3\2\2\2\u0218"+
+		"\u0213\3\2\2\2\u0219\u0084\3\2\2\2\u021a\u021c\7/\2\2\u021b\u021a\3\2"+
+		"\2\2\u021b\u021c\3\2\2\2\u021c\u021d\3\2\2\2\u021d\u0224\5\u0087D\2\u021e"+
+		"\u0220\7/\2\2\u021f\u021e\3\2\2\2\u021f\u0220\3\2\2\2\u0220\u0221\3\2"+
+		"\2\2\u0221\u0224\5\u0089E\2\u0222\u0224\5\u008bF\2\u0223\u021b\3\2\2\2"+
+		"\u0223\u021f\3\2\2\2\u0223\u0222\3\2\2\2\u0224\u0086\3\2\2\2\u0225\u0227"+
+		"\t\5\2\2\u0226\u0225\3\2\2\2\u0227\u0228\3\2\2\2\u0228\u0226\3\2\2\2\u0228"+
+		"\u0229\3\2\2\2\u0229\u022a\3\2\2\2\u022a\u022e\7\60\2\2\u022b\u022d\t"+
+		"\5\2\2\u022c\u022b\3\2\2\2\u022d\u0230\3\2\2\2\u022e\u022c\3\2\2\2\u022e"+
+		"\u022f\3\2\2\2\u022f\u0088\3\2\2\2\u0230\u022e\3\2\2\2\u0231\u0235\t\6"+
+		"\2\2\u0232\u0234\t\5\2\2\u0233\u0232\3\2\2\2\u0234\u0237\3\2\2\2\u0235"+
+		"\u0233\3\2\2\2\u0235\u0236\3\2\2\2\u0236\u008a\3\2\2\2\u0237\u0235\3\2"+
+		"\2\2\u0238\u0239\7\62\2\2\u0239\u008c\3\2\2\2\u023a\u0240\7)\2\2\u023b"+
+		"\u023f\n\7\2\2\u023c\u023d\7)\2\2\u023d\u023f\7)\2\2\u023e\u023b\3\2\2"+
+		"\2\u023e\u023c\3\2\2\2\u023f\u0242\3\2\2\2\u0240\u023e\3\2\2\2\u0240\u0241"+
+		"\3\2\2\2\u0241\u0243\3\2\2\2\u0242\u0240\3\2\2\2\u0243\u0244\7)\2\2\u0244"+
+		"\u008e\3\2\2\2\u0245\u0246\t\b\2\2\u0246\u0247\3\2\2\2\u0247\u0248\bH"+
+		"\2\2\u0248\u0090\3\2\2\2\17\2\u01d5\u01dc\u020d\u0218\u021b\u021f\u0223"+
+		"\u0228\u022e\u0235\u023e\u0240\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
index 4df1b445f..d6d4462ab 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
@@ -60,16 +60,18 @@ T__58=59
 T__59=60
 INPUT_VARIABLE=61
 PATH_VARIABLE=62
-BOOLEAN_LITERAL=63
-NUMBER_LITERAL=64
-DOUBLE=65
-INT=66
-ZERO=67
-STRING_LITERAL=68
-WS=69
-'select'=1
-'('=2
-')'=3
+QUOTED_PATH_VARIABLE=63
+PROP_FORMULA=64
+BOOLEAN_LITERAL=65
+NUMBER_LITERAL=66
+DOUBLE=67
+INT=68
+ZERO=69
+STRING_LITERAL=70
+WS=71
+'('=1
+')'=2
+'select'=3
 'distinct'=4
 'where'=5
 'order'=6
@@ -127,4 +129,4 @@ WS=69
 'ne'=58
 'ieq'=59
 'ine'=60
-'0'=67
+'0'=69
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
index 357206cd2..e8e252998 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -17,6 +17,16 @@ public interface EQLListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitSelect_statement(EQLParser.Select_statementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#select_properties}.
+	 * @param ctx the parse tree
+	 */
+	void enterSelect_properties(EQLParser.Select_propertiesContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#select_properties}.
+	 * @param ctx the parse tree
+	 */
+	void exitSelect_properties(EQLParser.Select_propertiesContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link EQLParser#select_clause}.
 	 * @param ctx the parse tree
@@ -147,6 +157,16 @@ public interface EQLListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_path_path}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_path_path(EQLParser.Fetch_path_pathContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_path_path}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_path_path(EQLParser.Fetch_path_pathContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link EQLParser#fetch_property}.
 	 * @param ctx the parse tree
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index f6c7f0fad..9649ffd87 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -36,34 +36,35 @@ public class EQLParser extends Parser {
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45,
 		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52,
 		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, T__57=58, T__58=59,
-		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, BOOLEAN_LITERAL=63, NUMBER_LITERAL=64,
-		DOUBLE=65, INT=66, ZERO=67, STRING_LITERAL=68, WS=69;
+		T__59=60, INPUT_VARIABLE=61, PATH_VARIABLE=62, QUOTED_PATH_VARIABLE=63,
+		PROP_FORMULA=64, BOOLEAN_LITERAL=65, NUMBER_LITERAL=66, DOUBLE=67, INT=68,
+		ZERO=69, STRING_LITERAL=70, WS=71;
 	public static final int
-		RULE_select_statement = 0, RULE_select_clause = 1, RULE_distinct = 2,
-		RULE_fetch_clause = 3, RULE_where_clause = 4, RULE_orderby_clause = 5,
-		RULE_orderby_property = 6, RULE_nulls_firstlast = 7, RULE_asc_desc = 8,
-		RULE_limit_clause = 9, RULE_offset_clause = 10, RULE_fetch_path = 11,
-		RULE_fetch_property_set = 12, RULE_fetch_property_group = 13, RULE_fetch_property = 14,
-		RULE_fetch_query_hint = 15, RULE_fetch_lazy_hint = 16, RULE_fetch_option = 17,
-		RULE_fetch_query_option = 18, RULE_fetch_lazy_option = 19, RULE_fetch_batch_size = 20,
-		RULE_conditional_expression = 21, RULE_conditional_term = 22, RULE_conditional_factor = 23,
-		RULE_conditional_primary = 24, RULE_any_expression = 25, RULE_in_expression = 26,
-		RULE_in_value = 27, RULE_between_expression = 28, RULE_inrange_expression = 29,
-		RULE_propertyBetween_expression = 30, RULE_isNull_expression = 31, RULE_isNotNull_expression = 32,
-		RULE_isEmpty_expression = 33, RULE_isNotEmpty_expression = 34, RULE_like_expression = 35,
-		RULE_like_op = 36, RULE_comparison_expression = 37, RULE_comparison_operator = 38,
-		RULE_value_expression = 39, RULE_literal = 40;
+		RULE_select_statement = 0, RULE_select_properties = 1, RULE_select_clause = 2,
+		RULE_distinct = 3, RULE_fetch_clause = 4, RULE_where_clause = 5, RULE_orderby_clause = 6,
+		RULE_orderby_property = 7, RULE_nulls_firstlast = 8, RULE_asc_desc = 9,
+		RULE_limit_clause = 10, RULE_offset_clause = 11, RULE_fetch_path = 12,
+		RULE_fetch_property_set = 13, RULE_fetch_property_group = 14, RULE_fetch_path_path = 15,
+		RULE_fetch_property = 16, RULE_fetch_query_hint = 17, RULE_fetch_lazy_hint = 18,
+		RULE_fetch_option = 19, RULE_fetch_query_option = 20, RULE_fetch_lazy_option = 21,
+		RULE_fetch_batch_size = 22, RULE_conditional_expression = 23, RULE_conditional_term = 24,
+		RULE_conditional_factor = 25, RULE_conditional_primary = 26, RULE_any_expression = 27,
+		RULE_in_expression = 28, RULE_in_value = 29, RULE_between_expression = 30,
+		RULE_inrange_expression = 31, RULE_propertyBetween_expression = 32, RULE_isNull_expression = 33,
+		RULE_isNotNull_expression = 34, RULE_isEmpty_expression = 35, RULE_isNotEmpty_expression = 36,
+		RULE_like_expression = 37, RULE_like_op = 38, RULE_comparison_expression = 39,
+		RULE_comparison_operator = 40, RULE_value_expression = 41, RULE_literal = 42;
 	private static String[] makeRuleNames() {
 		return new String[] {
-			"select_statement", "select_clause", "distinct", "fetch_clause", "where_clause",
-			"orderby_clause", "orderby_property", "nulls_firstlast", "asc_desc",
-			"limit_clause", "offset_clause", "fetch_path", "fetch_property_set",
-			"fetch_property_group", "fetch_property", "fetch_query_hint", "fetch_lazy_hint",
-			"fetch_option", "fetch_query_option", "fetch_lazy_option", "fetch_batch_size",
-			"conditional_expression", "conditional_term", "conditional_factor", "conditional_primary",
-			"any_expression", "in_expression", "in_value", "between_expression",
-			"inrange_expression", "propertyBetween_expression", "isNull_expression",
-			"isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression",
+			"select_statement", "select_properties", "select_clause", "distinct",
+			"fetch_clause", "where_clause", "orderby_clause", "orderby_property",
+			"nulls_firstlast", "asc_desc", "limit_clause", "offset_clause", "fetch_path",
+			"fetch_property_set", "fetch_property_group", "fetch_path_path", "fetch_property",
+			"fetch_query_hint", "fetch_lazy_hint", "fetch_option", "fetch_query_option",
+			"fetch_lazy_option", "fetch_batch_size", "conditional_expression", "conditional_term",
+			"conditional_factor", "conditional_primary", "any_expression", "in_expression",
+			"in_value", "between_expression", "inrange_expression", "propertyBetween_expression",
+			"isNull_expression", "isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression",
 			"like_expression", "like_op", "comparison_expression", "comparison_operator",
 			"value_expression", "literal"
 		};
@@ -72,7 +73,7 @@ public class EQLParser extends Parser {
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
+			null, "'('", "')'", "'select'", "'distinct'", "'where'", "'order'", "'by'",
 			"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'",
 			"'offset'", "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'",
 			"'in'", "'between'", "'inrange'", "'to'", "'is'", "'null'", "'isNull'",
@@ -80,7 +81,7 @@ public class EQLParser extends Parser {
 			"'like'", "'ilike'", "'contains'", "'icontains'", "'startsWith'", "'istartsWith'",
 			"'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'",
 			"'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'",
-			"'ieq'", "'ine'", null, null, null, null, null, null, "'0'"
+			"'ieq'", "'ine'", null, null, null, null, null, null, null, null, "'0'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -91,8 +92,9 @@ public class EQLParser extends Parser {
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
 			null, null, null, null, null, null, null, null, null, null, null, null,
-			null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
-			"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+			null, "INPUT_VARIABLE", "PATH_VARIABLE", "QUOTED_PATH_VARIABLE", "PROP_FORMULA",
+			"BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL",
+			"WS"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -187,61 +189,61 @@ public class EQLParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(83);
+			setState(87);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__0) {
+			if (_la==T__2) {
 				{
-				setState(82);
+				setState(86);
 				select_clause();
 				}
 			}
 
-			setState(88);
+			setState(92);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__15) {
 				{
 				{
-				setState(85);
+				setState(89);
 				fetch_clause();
 				}
 				}
-				setState(90);
+				setState(94);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(92);
+			setState(96);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__4) {
 				{
-				setState(91);
+				setState(95);
 				where_clause();
 				}
 			}
 
-			setState(95);
+			setState(99);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__5) {
 				{
-				setState(94);
+				setState(98);
 				orderby_clause();
 				}
 			}
 
-			setState(98);
+			setState(102);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__13) {
 				{
-				setState(97);
+				setState(101);
 				limit_clause();
 				}
 			}
 
-			setState(100);
+			setState(104);
 			match(EOF);
 			}
 		}
@@ -256,10 +258,70 @@ public class EQLParser extends Parser {
 		return _localctx;
 	}
 
-	public static class Select_clauseContext extends ParserRuleContext {
+	public static class Select_propertiesContext extends ParserRuleContext {
 		public Fetch_property_groupContext fetch_property_group() {
 			return getRuleContext(Fetch_property_groupContext.class,0);
 		}
+		public Select_propertiesContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_select_properties; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterSelect_properties(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitSelect_properties(this);
+		}
+	}
+
+	public final Select_propertiesContext select_properties() throws RecognitionException {
+		Select_propertiesContext _localctx = new Select_propertiesContext(_ctx, getState());
+		enterRule(_localctx, 2, RULE_select_properties);
+		try {
+			setState(111);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case T__0:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(106);
+				match(T__0);
+				setState(107);
+				fetch_property_group();
+				setState(108);
+				match(T__1);
+				}
+				break;
+			case T__16:
+			case PATH_VARIABLE:
+			case PROP_FORMULA:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(110);
+				fetch_property_group();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	public static class Select_clauseContext extends ParserRuleContext {
+		public Select_propertiesContext select_properties() {
+			return getRuleContext(Select_propertiesContext.class,0);
+		}
 		public DistinctContext distinct() {
 			return getRuleContext(DistinctContext.class,0);
 		}
@@ -279,29 +341,25 @@ public class EQLParser extends Parser {
 
 	public final Select_clauseContext select_clause() throws RecognitionException {
 		Select_clauseContext _localctx = new Select_clauseContext(_ctx, getState());
-		enterRule(_localctx, 2, RULE_select_clause);
+		enterRule(_localctx, 4, RULE_select_clause);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(102);
-			match(T__0);
-			setState(104);
+			setState(113);
+			match(T__2);
+			setState(115);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__3) {
 				{
-				setState(103);
+				setState(114);
 				distinct();
 				}
 			}
 
-			setState(106);
-			match(T__1);
-			setState(107);
-			fetch_property_group();
-			setState(108);
-			match(T__2);
+			setState(117);
+			select_properties();
 			}
 		}
 		catch (RecognitionException re) {
@@ -332,11 +390,11 @@ public class EQLParser extends Parser {
 
 	public final DistinctContext distinct() throws RecognitionException {
 		DistinctContext _localctx = new DistinctContext(_ctx, getState());
-		enterRule(_localctx, 4, RULE_distinct);
+		enterRule(_localctx, 6, RULE_distinct);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(110);
+			setState(119);
 			match(T__3);
 			}
 		}
@@ -371,11 +429,11 @@ public class EQLParser extends Parser {
 
 	public final Fetch_clauseContext fetch_clause() throws RecognitionException {
 		Fetch_clauseContext _localctx = new Fetch_clauseContext(_ctx, getState());
-		enterRule(_localctx, 6, RULE_fetch_clause);
+		enterRule(_localctx, 8, RULE_fetch_clause);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(112);
+			setState(121);
 			fetch_path();
 			}
 		}
@@ -410,13 +468,13 @@ public class EQLParser extends Parser {
 
 	public final Where_clauseContext where_clause() throws RecognitionException {
 		Where_clauseContext _localctx = new Where_clauseContext(_ctx, getState());
-		enterRule(_localctx, 8, RULE_where_clause);
+		enterRule(_localctx, 10, RULE_where_clause);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(114);
+			setState(123);
 			match(T__4);
-			setState(115);
+			setState(124);
 			conditional_expression();
 			}
 		}
@@ -454,30 +512,30 @@ public class EQLParser extends Parser {
 
 	public final Orderby_clauseContext orderby_clause() throws RecognitionException {
 		Orderby_clauseContext _localctx = new Orderby_clauseContext(_ctx, getState());
-		enterRule(_localctx, 10, RULE_orderby_clause);
+		enterRule(_localctx, 12, RULE_orderby_clause);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(117);
+			setState(126);
 			match(T__5);
-			setState(118);
+			setState(127);
 			match(T__6);
-			setState(119);
+			setState(128);
 			orderby_property();
-			setState(124);
+			setState(133);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__7) {
 				{
 				{
-				setState(120);
+				setState(129);
 				match(T__7);
-				setState(121);
+				setState(130);
 				orderby_property();
 				}
 				}
-				setState(126);
+				setState(135);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -518,29 +576,29 @@ public class EQLParser extends Parser {
 
 	public final Orderby_propertyContext orderby_property() throws RecognitionException {
 		Orderby_propertyContext _localctx = new Orderby_propertyContext(_ctx, getState());
-		enterRule(_localctx, 12, RULE_orderby_property);
+		enterRule(_localctx, 14, RULE_orderby_property);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(127);
+			setState(136);
 			match(PATH_VARIABLE);
-			setState(129);
+			setState(138);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__11 || _la==T__12) {
 				{
-				setState(128);
+				setState(137);
 				asc_desc();
 				}
 			}
 
-			setState(132);
+			setState(141);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__8) {
 				{
-				setState(131);
+				setState(140);
 				nulls_firstlast();
 				}
 			}
@@ -575,26 +633,26 @@ public class EQLParser extends Parser {
 
 	public final Nulls_firstlastContext nulls_firstlast() throws RecognitionException {
 		Nulls_firstlastContext _localctx = new Nulls_firstlastContext(_ctx, getState());
-		enterRule(_localctx, 14, RULE_nulls_firstlast);
+		enterRule(_localctx, 16, RULE_nulls_firstlast);
 		try {
-			setState(138);
+			setState(147);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,9,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,10,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(134);
+				setState(143);
 				match(T__8);
-				setState(135);
+				setState(144);
 				match(T__9);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(136);
+				setState(145);
 				match(T__8);
-				setState(137);
+				setState(146);
 				match(T__10);
 				}
 				break;
@@ -628,12 +686,12 @@ public class EQLParser extends Parser {
 
 	public final Asc_descContext asc_desc() throws RecognitionException {
 		Asc_descContext _localctx = new Asc_descContext(_ctx, getState());
-		enterRule(_localctx, 16, RULE_asc_desc);
+		enterRule(_localctx, 18, RULE_asc_desc);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(140);
+			setState(149);
 			_la = _input.LA(1);
 			if ( !(_la==T__11 || _la==T__12) ) {
 			_errHandler.recoverInline(this);
@@ -677,21 +735,21 @@ public class EQLParser extends Parser {
 
 	public final Limit_clauseContext limit_clause() throws RecognitionException {
 		Limit_clauseContext _localctx = new Limit_clauseContext(_ctx, getState());
-		enterRule(_localctx, 18, RULE_limit_clause);
+		enterRule(_localctx, 20, RULE_limit_clause);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(142);
+			setState(151);
 			match(T__13);
-			setState(143);
+			setState(152);
 			match(NUMBER_LITERAL);
-			setState(145);
+			setState(154);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__14) {
 				{
-				setState(144);
+				setState(153);
 				offset_clause();
 				}
 			}
@@ -727,13 +785,13 @@ public class EQLParser extends Parser {
 
 	public final Offset_clauseContext offset_clause() throws RecognitionException {
 		Offset_clauseContext _localctx = new Offset_clauseContext(_ctx, getState());
-		enterRule(_localctx, 20, RULE_offset_clause);
+		enterRule(_localctx, 22, RULE_offset_clause);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(147);
+			setState(156);
 			match(T__14);
-			setState(148);
+			setState(157);
 			match(NUMBER_LITERAL);
 			}
 		}
@@ -749,7 +807,9 @@ public class EQLParser extends Parser {
 	}
 
 	public static class Fetch_pathContext extends ParserRuleContext {
-		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public Fetch_path_pathContext fetch_path_path() {
+			return getRuleContext(Fetch_path_pathContext.class,0);
+		}
 		public Fetch_optionContext fetch_option() {
 			return getRuleContext(Fetch_optionContext.class,0);
 		}
@@ -772,31 +832,31 @@ public class EQLParser extends Parser {
 
 	public final Fetch_pathContext fetch_path() throws RecognitionException {
 		Fetch_pathContext _localctx = new Fetch_pathContext(_ctx, getState());
-		enterRule(_localctx, 22, RULE_fetch_path);
+		enterRule(_localctx, 24, RULE_fetch_path);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(150);
+			setState(159);
 			match(T__15);
-			setState(152);
+			setState(161);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__17 || _la==T__18) {
 				{
-				setState(151);
+				setState(160);
 				fetch_option();
 				}
 			}
 
-			setState(154);
-			match(PATH_VARIABLE);
-			setState(156);
+			setState(163);
+			fetch_path_path();
+			setState(165);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__1) {
+			if (_la==T__0) {
 				{
-				setState(155);
+				setState(164);
 				fetch_property_set();
 				}
 			}
@@ -834,16 +894,16 @@ public class EQLParser extends Parser {
 
 	public final Fetch_property_setContext fetch_property_set() throws RecognitionException {
 		Fetch_property_setContext _localctx = new Fetch_property_setContext(_ctx, getState());
-		enterRule(_localctx, 24, RULE_fetch_property_set);
+		enterRule(_localctx, 26, RULE_fetch_property_set);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(158);
-			match(T__1);
-			setState(159);
+			setState(167);
+			match(T__0);
+			setState(168);
 			fetch_property_group();
-			setState(160);
-			match(T__2);
+			setState(169);
+			match(T__1);
 			}
 		}
 		catch (RecognitionException re) {
@@ -880,26 +940,26 @@ public class EQLParser extends Parser {
 
 	public final Fetch_property_groupContext fetch_property_group() throws RecognitionException {
 		Fetch_property_groupContext _localctx = new Fetch_property_groupContext(_ctx, getState());
-		enterRule(_localctx, 26, RULE_fetch_property_group);
+		enterRule(_localctx, 28, RULE_fetch_property_group);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(162);
+			setState(171);
 			fetch_property();
-			setState(167);
+			setState(176);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__7) {
 				{
 				{
-				setState(163);
+				setState(172);
 				match(T__7);
-				setState(164);
+				setState(173);
 				fetch_property();
 				}
 				}
-				setState(169);
+				setState(178);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -916,6 +976,53 @@ public class EQLParser extends Parser {
 		return _localctx;
 	}
 
+	public static class Fetch_path_pathContext extends ParserRuleContext {
+		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
+		public TerminalNode QUOTED_PATH_VARIABLE() { return getToken(EQLParser.QUOTED_PATH_VARIABLE, 0); }
+		public Fetch_path_pathContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fetch_path_path; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).enterFetch_path_path(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof EQLListener ) ((EQLListener)listener).exitFetch_path_path(this);
+		}
+	}
+
+	public final Fetch_path_pathContext fetch_path_path() throws RecognitionException {
+		Fetch_path_pathContext _localctx = new Fetch_path_pathContext(_ctx, getState());
+		enterRule(_localctx, 30, RULE_fetch_path_path);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(179);
+			_la = _input.LA(1);
+			if ( !(_la==PATH_VARIABLE || _la==QUOTED_PATH_VARIABLE) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
 	public static class Fetch_propertyContext extends ParserRuleContext {
 		public TerminalNode PATH_VARIABLE() { return getToken(EQLParser.PATH_VARIABLE, 0); }
 		public Fetch_query_hintContext fetch_query_hint() {
@@ -924,6 +1031,7 @@ public class EQLParser extends Parser {
 		public Fetch_lazy_hintContext fetch_lazy_hint() {
 			return getRuleContext(Fetch_lazy_hintContext.class,0);
 		}
+		public TerminalNode PROP_FORMULA() { return getToken(EQLParser.PROP_FORMULA, 0); }
 		public Fetch_propertyContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -940,32 +1048,39 @@ public class EQLParser extends Parser {
 
 	public final Fetch_propertyContext fetch_property() throws RecognitionException {
 		Fetch_propertyContext _localctx = new Fetch_propertyContext(_ctx, getState());
-		enterRule(_localctx, 28, RULE_fetch_property);
+		enterRule(_localctx, 32, RULE_fetch_property);
 		try {
-			setState(173);
+			setState(185);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(170);
+				setState(181);
 				match(PATH_VARIABLE);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(171);
+				setState(182);
 				fetch_query_hint();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(172);
+				setState(183);
 				fetch_lazy_hint();
 				}
 				break;
+			case 4:
+				enterOuterAlt(_localctx, 4);
+				{
+				setState(184);
+				match(PROP_FORMULA);
+				}
+				break;
 			}
 		}
 		catch (RecognitionException re) {
@@ -999,13 +1114,13 @@ public class EQLParser extends Parser {
 
 	public final Fetch_query_hintContext fetch_query_hint() throws RecognitionException {
 		Fetch_query_hintContext _localctx = new Fetch_query_hintContext(_ctx, getState());
-		enterRule(_localctx, 30, RULE_fetch_query_hint);
+		enterRule(_localctx, 34, RULE_fetch_query_hint);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(175);
+			setState(187);
 			match(T__16);
-			setState(176);
+			setState(188);
 			fetch_query_option();
 			}
 		}
@@ -1040,13 +1155,13 @@ public class EQLParser extends Parser {
 
 	public final Fetch_lazy_hintContext fetch_lazy_hint() throws RecognitionException {
 		Fetch_lazy_hintContext _localctx = new Fetch_lazy_hintContext(_ctx, getState());
-		enterRule(_localctx, 32, RULE_fetch_lazy_hint);
+		enterRule(_localctx, 36, RULE_fetch_lazy_hint);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(178);
+			setState(190);
 			match(T__16);
-			setState(179);
+			setState(191);
 			fetch_lazy_option();
 			}
 		}
@@ -1084,22 +1199,22 @@ public class EQLParser extends Parser {
 
 	public final Fetch_optionContext fetch_option() throws RecognitionException {
 		Fetch_optionContext _localctx = new Fetch_optionContext(_ctx, getState());
-		enterRule(_localctx, 34, RULE_fetch_option);
+		enterRule(_localctx, 38, RULE_fetch_option);
 		try {
-			setState(183);
+			setState(195);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case T__17:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(181);
+				setState(193);
 				fetch_query_option();
 				}
 				break;
 			case T__18:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(182);
+				setState(194);
 				fetch_lazy_option();
 				}
 				break;
@@ -1138,19 +1253,19 @@ public class EQLParser extends Parser {
 
 	public final Fetch_query_optionContext fetch_query_option() throws RecognitionException {
 		Fetch_query_optionContext _localctx = new Fetch_query_optionContext(_ctx, getState());
-		enterRule(_localctx, 36, RULE_fetch_query_option);
+		enterRule(_localctx, 40, RULE_fetch_query_option);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(185);
+			setState(197);
 			match(T__17);
-			setState(187);
+			setState(199);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__1) {
+			if (_la==T__0) {
 				{
-				setState(186);
+				setState(198);
 				fetch_batch_size();
 				}
 			}
@@ -1188,19 +1303,19 @@ public class EQLParser extends Parser {
 
 	public final Fetch_lazy_optionContext fetch_lazy_option() throws RecognitionException {
 		Fetch_lazy_optionContext _localctx = new Fetch_lazy_optionContext(_ctx, getState());
-		enterRule(_localctx, 38, RULE_fetch_lazy_option);
+		enterRule(_localctx, 42, RULE_fetch_lazy_option);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(189);
+			setState(201);
 			match(T__18);
-			setState(191);
+			setState(203);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__1) {
+			if (_la==T__0) {
 				{
-				setState(190);
+				setState(202);
 				fetch_batch_size();
 				}
 			}
@@ -1236,16 +1351,16 @@ public class EQLParser extends Parser {
 
 	public final Fetch_batch_sizeContext fetch_batch_size() throws RecognitionException {
 		Fetch_batch_sizeContext _localctx = new Fetch_batch_sizeContext(_ctx, getState());
-		enterRule(_localctx, 40, RULE_fetch_batch_size);
+		enterRule(_localctx, 44, RULE_fetch_batch_size);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(193);
-			match(T__1);
-			setState(194);
+			setState(205);
+			match(T__0);
+			setState(206);
 			match(NUMBER_LITERAL);
-			setState(195);
-			match(T__2);
+			setState(207);
+			match(T__1);
 			}
 		}
 		catch (RecognitionException re) {
@@ -1282,26 +1397,26 @@ public class EQLParser extends Parser {
 
 	public final Conditional_expressionContext conditional_expression() throws RecognitionException {
 		Conditional_expressionContext _localctx = new Conditional_expressionContext(_ctx, getState());
-		enterRule(_localctx, 42, RULE_conditional_expression);
+		enterRule(_localctx, 46, RULE_conditional_expression);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(197);
+			setState(209);
 			conditional_term();
-			setState(202);
+			setState(214);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__19) {
 				{
 				{
-				setState(198);
+				setState(210);
 				match(T__19);
-				setState(199);
+				setState(211);
 				conditional_term();
 				}
 				}
-				setState(204);
+				setState(216);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1341,26 +1456,26 @@ public class EQLParser extends Parser {
 
 	public final Conditional_termContext conditional_term() throws RecognitionException {
 		Conditional_termContext _localctx = new Conditional_termContext(_ctx, getState());
-		enterRule(_localctx, 44, RULE_conditional_term);
+		enterRule(_localctx, 48, RULE_conditional_term);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(205);
+			setState(217);
 			conditional_factor();
-			setState(210);
+			setState(222);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__20) {
 				{
 				{
-				setState(206);
+				setState(218);
 				match(T__20);
-				setState(207);
+				setState(219);
 				conditional_factor();
 				}
 				}
-				setState(212);
+				setState(224);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1397,22 +1512,22 @@ public class EQLParser extends Parser {
 
 	public final Conditional_factorContext conditional_factor() throws RecognitionException {
 		Conditional_factorContext _localctx = new Conditional_factorContext(_ctx, getState());
-		enterRule(_localctx, 46, RULE_conditional_factor);
+		enterRule(_localctx, 50, RULE_conditional_factor);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(214);
+			setState(226);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__21) {
 				{
-				setState(213);
+				setState(225);
 				match(T__21);
 				}
 			}
 
-			setState(216);
+			setState(228);
 			conditional_primary();
 			}
 		}
@@ -1450,27 +1565,27 @@ public class EQLParser extends Parser {
 
 	public final Conditional_primaryContext conditional_primary() throws RecognitionException {
 		Conditional_primaryContext _localctx = new Conditional_primaryContext(_ctx, getState());
-		enterRule(_localctx, 48, RULE_conditional_primary);
+		enterRule(_localctx, 52, RULE_conditional_primary);
 		try {
-			setState(223);
+			setState(235);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,21,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(218);
+				setState(230);
 				any_expression();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(219);
-				match(T__1);
-				setState(220);
+				setState(231);
+				match(T__0);
+				setState(232);
 				conditional_expression();
-				setState(221);
-				match(T__2);
+				setState(233);
+				match(T__1);
 				}
 				break;
 			}
@@ -1536,90 +1651,90 @@ public class EQLParser extends Parser {
 
 	public final Any_expressionContext any_expression() throws RecognitionException {
 		Any_expressionContext _localctx = new Any_expressionContext(_ctx, getState());
-		enterRule(_localctx, 50, RULE_any_expression);
+		enterRule(_localctx, 54, RULE_any_expression);
 		try {
-			setState(239);
+			setState(251);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(225);
+				setState(237);
 				comparison_expression();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(226);
+				setState(238);
 				like_expression();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(227);
+				setState(239);
 				inrange_expression();
 				}
 				break;
 			case 4:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(228);
+				setState(240);
 				between_expression();
 				}
 				break;
 			case 5:
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(229);
+				setState(241);
 				propertyBetween_expression();
 				}
 				break;
 			case 6:
 				enterOuterAlt(_localctx, 6);
 				{
-				setState(230);
+				setState(242);
 				in_expression();
 				}
 				break;
 			case 7:
 				enterOuterAlt(_localctx, 7);
 				{
-				setState(231);
+				setState(243);
 				isNull_expression();
 				}
 				break;
 			case 8:
 				enterOuterAlt(_localctx, 8);
 				{
-				setState(232);
+				setState(244);
 				isNotNull_expression();
 				}
 				break;
 			case 9:
 				enterOuterAlt(_localctx, 9);
 				{
-				setState(233);
+				setState(245);
 				isEmpty_expression();
 				}
 				break;
 			case 10:
 				enterOuterAlt(_localctx, 10);
 				{
-				setState(234);
+				setState(246);
 				isNotEmpty_expression();
 				}
 				break;
 			case 11:
 				enterOuterAlt(_localctx, 11);
 				{
-				setState(235);
-				match(T__1);
-				setState(236);
+				setState(247);
+				match(T__0);
+				setState(248);
 				any_expression();
-				setState(237);
-				match(T__2);
+				setState(249);
+				match(T__1);
 				}
 				break;
 			}
@@ -1656,15 +1771,15 @@ public class EQLParser extends Parser {
 
 	public final In_expressionContext in_expression() throws RecognitionException {
 		In_expressionContext _localctx = new In_expressionContext(_ctx, getState());
-		enterRule(_localctx, 52, RULE_in_expression);
+		enterRule(_localctx, 56, RULE_in_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(241);
+			setState(253);
 			match(PATH_VARIABLE);
-			setState(242);
+			setState(254);
 			match(T__22);
-			setState(243);
+			setState(255);
 			in_value();
 			}
 		}
@@ -1703,44 +1818,44 @@ public class EQLParser extends Parser {
 
 	public final In_valueContext in_value() throws RecognitionException {
 		In_valueContext _localctx = new In_valueContext(_ctx, getState());
-		enterRule(_localctx, 54, RULE_in_value);
+		enterRule(_localctx, 58, RULE_in_value);
 		int _la;
 		try {
-			setState(257);
+			setState(269);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case INPUT_VARIABLE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(245);
+				setState(257);
 				match(INPUT_VARIABLE);
 				}
 				break;
-			case T__1:
+			case T__0:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(246);
-				match(T__1);
-				setState(247);
+				setState(258);
+				match(T__0);
+				setState(259);
 				value_expression();
-				setState(252);
+				setState(264);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 				while (_la==T__7) {
 					{
 					{
-					setState(248);
+					setState(260);
 					match(T__7);
-					setState(249);
+					setState(261);
 					value_expression();
 					}
 					}
-					setState(254);
+					setState(266);
 					_errHandler.sync(this);
 					_la = _input.LA(1);
 				}
-				setState(255);
-				match(T__2);
+				setState(267);
+				match(T__1);
 				}
 				break;
 			default:
@@ -1782,19 +1897,19 @@ public class EQLParser extends Parser {
 
 	public final Between_expressionContext between_expression() throws RecognitionException {
 		Between_expressionContext _localctx = new Between_expressionContext(_ctx, getState());
-		enterRule(_localctx, 56, RULE_between_expression);
+		enterRule(_localctx, 60, RULE_between_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(259);
+			setState(271);
 			match(PATH_VARIABLE);
-			setState(260);
+			setState(272);
 			match(T__23);
-			setState(261);
+			setState(273);
 			value_expression();
-			setState(262);
+			setState(274);
 			match(T__20);
-			setState(263);
+			setState(275);
 			value_expression();
 			}
 		}
@@ -1833,19 +1948,19 @@ public class EQLParser extends Parser {
 
 	public final Inrange_expressionContext inrange_expression() throws RecognitionException {
 		Inrange_expressionContext _localctx = new Inrange_expressionContext(_ctx, getState());
-		enterRule(_localctx, 58, RULE_inrange_expression);
+		enterRule(_localctx, 62, RULE_inrange_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(265);
+			setState(277);
 			match(PATH_VARIABLE);
-			setState(266);
+			setState(278);
 			match(T__24);
-			setState(267);
+			setState(279);
 			value_expression();
-			setState(268);
+			setState(280);
 			match(T__25);
-			setState(269);
+			setState(281);
 			value_expression();
 			}
 		}
@@ -1884,19 +1999,19 @@ public class EQLParser extends Parser {
 
 	public final PropertyBetween_expressionContext propertyBetween_expression() throws RecognitionException {
 		PropertyBetween_expressionContext _localctx = new PropertyBetween_expressionContext(_ctx, getState());
-		enterRule(_localctx, 60, RULE_propertyBetween_expression);
+		enterRule(_localctx, 64, RULE_propertyBetween_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(271);
+			setState(283);
 			value_expression();
-			setState(272);
+			setState(284);
 			match(T__23);
-			setState(273);
+			setState(285);
 			match(PATH_VARIABLE);
-			setState(274);
+			setState(286);
 			match(T__20);
-			setState(275);
+			setState(287);
 			match(PATH_VARIABLE);
 			}
 		}
@@ -1929,28 +2044,28 @@ public class EQLParser extends Parser {
 
 	public final IsNull_expressionContext isNull_expression() throws RecognitionException {
 		IsNull_expressionContext _localctx = new IsNull_expressionContext(_ctx, getState());
-		enterRule(_localctx, 62, RULE_isNull_expression);
+		enterRule(_localctx, 66, RULE_isNull_expression);
 		try {
-			setState(282);
+			setState(294);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(277);
+				setState(289);
 				match(PATH_VARIABLE);
-				setState(278);
+				setState(290);
 				match(T__26);
-				setState(279);
+				setState(291);
 				match(T__27);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(280);
+				setState(292);
 				match(PATH_VARIABLE);
-				setState(281);
+				setState(293);
 				match(T__28);
 				}
 				break;
@@ -1985,39 +2100,39 @@ public class EQLParser extends Parser {
 
 	public final IsNotNull_expressionContext isNotNull_expression() throws RecognitionException {
 		IsNotNull_expressionContext _localctx = new IsNotNull_expressionContext(_ctx, getState());
-		enterRule(_localctx, 64, RULE_isNotNull_expression);
+		enterRule(_localctx, 68, RULE_isNotNull_expression);
 		try {
-			setState(292);
+			setState(304);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(284);
+				setState(296);
 				match(PATH_VARIABLE);
-				setState(285);
+				setState(297);
 				match(T__26);
-				setState(286);
+				setState(298);
 				match(T__21);
-				setState(287);
+				setState(299);
 				match(T__27);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(288);
+				setState(300);
 				match(PATH_VARIABLE);
-				setState(289);
+				setState(301);
 				match(T__29);
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(290);
+				setState(302);
 				match(PATH_VARIABLE);
-				setState(291);
+				setState(303);
 				match(T__30);
 				}
 				break;
@@ -2052,28 +2167,28 @@ public class EQLParser extends Parser {
 
 	public final IsEmpty_expressionContext isEmpty_expression() throws RecognitionException {
 		IsEmpty_expressionContext _localctx = new IsEmpty_expressionContext(_ctx, getState());
-		enterRule(_localctx, 66, RULE_isEmpty_expression);
+		enterRule(_localctx, 70, RULE_isEmpty_expression);
 		try {
-			setState(299);
+			setState(311);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,27,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(294);
+				setState(306);
 				match(PATH_VARIABLE);
-				setState(295);
+				setState(307);
 				match(T__26);
-				setState(296);
+				setState(308);
 				match(T__31);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(297);
+				setState(309);
 				match(PATH_VARIABLE);
-				setState(298);
+				setState(310);
 				match(T__32);
 				}
 				break;
@@ -2108,39 +2223,39 @@ public class EQLParser extends Parser {
 
 	public final IsNotEmpty_expressionContext isNotEmpty_expression() throws RecognitionException {
 		IsNotEmpty_expressionContext _localctx = new IsNotEmpty_expressionContext(_ctx, getState());
-		enterRule(_localctx, 68, RULE_isNotEmpty_expression);
+		enterRule(_localctx, 72, RULE_isNotEmpty_expression);
 		try {
-			setState(309);
+			setState(321);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(301);
+				setState(313);
 				match(PATH_VARIABLE);
-				setState(302);
+				setState(314);
 				match(T__26);
-				setState(303);
+				setState(315);
 				match(T__21);
-				setState(304);
+				setState(316);
 				match(T__31);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(305);
+				setState(317);
 				match(PATH_VARIABLE);
-				setState(306);
+				setState(318);
 				match(T__33);
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(307);
+				setState(319);
 				match(PATH_VARIABLE);
-				setState(308);
+				setState(320);
 				match(T__34);
 				}
 				break;
@@ -2181,15 +2296,15 @@ public class EQLParser extends Parser {
 
 	public final Like_expressionContext like_expression() throws RecognitionException {
 		Like_expressionContext _localctx = new Like_expressionContext(_ctx, getState());
-		enterRule(_localctx, 70, RULE_like_expression);
+		enterRule(_localctx, 74, RULE_like_expression);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(311);
+			setState(323);
 			match(PATH_VARIABLE);
-			setState(312);
+			setState(324);
 			like_op();
-			setState(313);
+			setState(325);
 			value_expression();
 			}
 		}
@@ -2221,12 +2336,12 @@ public class EQLParser extends Parser {
 
 	public final Like_opContext like_op() throws RecognitionException {
 		Like_opContext _localctx = new Like_opContext(_ctx, getState());
-		enterRule(_localctx, 72, RULE_like_op);
+		enterRule(_localctx, 76, RULE_like_op);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(315);
+			setState(327);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__35) | (1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40) | (1L << T__41) | (1L << T__42))) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -2273,19 +2388,19 @@ public class EQLParser extends Parser {
 
 	public final Comparison_expressionContext comparison_expression() throws RecognitionException {
 		Comparison_expressionContext _localctx = new Comparison_expressionContext(_ctx, getState());
-		enterRule(_localctx, 74, RULE_comparison_expression);
+		enterRule(_localctx, 78, RULE_comparison_expression);
 		try {
-			setState(325);
+			setState(337);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case PATH_VARIABLE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(317);
+				setState(329);
 				match(PATH_VARIABLE);
-				setState(318);
+				setState(330);
 				comparison_operator();
-				setState(319);
+				setState(331);
 				value_expression();
 				}
 				break;
@@ -2295,11 +2410,11 @@ public class EQLParser extends Parser {
 			case STRING_LITERAL:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(321);
+				setState(333);
 				value_expression();
-				setState(322);
+				setState(334);
 				comparison_operator();
-				setState(323);
+				setState(335);
 				match(PATH_VARIABLE);
 				}
 				break;
@@ -2335,12 +2450,12 @@ public class EQLParser extends Parser {
 
 	public final Comparison_operatorContext comparison_operator() throws RecognitionException {
 		Comparison_operatorContext _localctx = new Comparison_operatorContext(_ctx, getState());
-		enterRule(_localctx, 76, RULE_comparison_operator);
+		enterRule(_localctx, 80, RULE_comparison_operator);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(327);
+			setState(339);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52) | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56) | (1L << T__57) | (1L << T__58) | (1L << T__59))) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -2384,9 +2499,9 @@ public class EQLParser extends Parser {
 
 	public final Value_expressionContext value_expression() throws RecognitionException {
 		Value_expressionContext _localctx = new Value_expressionContext(_ctx, getState());
-		enterRule(_localctx, 78, RULE_value_expression);
+		enterRule(_localctx, 82, RULE_value_expression);
 		try {
-			setState(331);
+			setState(343);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case BOOLEAN_LITERAL:
@@ -2394,14 +2509,14 @@ public class EQLParser extends Parser {
 			case STRING_LITERAL:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(329);
+				setState(341);
 				literal();
 				}
 				break;
 			case INPUT_VARIABLE:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(330);
+				setState(342);
 				match(INPUT_VARIABLE);
 				}
 				break;
@@ -2440,14 +2555,14 @@ public class EQLParser extends Parser {
 
 	public final LiteralContext literal() throws RecognitionException {
 		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 80, RULE_literal);
+		enterRule(_localctx, 84, RULE_literal);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(333);
+			setState(345);
 			_la = _input.LA(1);
-			if ( !(((((_la - 63)) & ~0x3f) == 0 && ((1L << (_la - 63)) & ((1L << (BOOLEAN_LITERAL - 63)) | (1L << (NUMBER_LITERAL - 63)) | (1L << (STRING_LITERAL - 63)))) != 0)) ) {
+			if ( !(((((_la - 65)) & ~0x3f) == 0 && ((1L << (_la - 65)) & ((1L << (BOOLEAN_LITERAL - 65)) | (1L << (NUMBER_LITERAL - 65)) | (1L << (STRING_LITERAL - 65)))) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -2469,118 +2584,122 @@ public class EQLParser extends Parser {
 	}
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3G\u0152\4\2\t\2\4"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3I\u015e\4\2\t\2\4"+
 		"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
 		"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
 		"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
-		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\3\2\5\2"+
-		"V\n\2\3\2\7\2Y\n\2\f\2\16\2\\\13\2\3\2\5\2_\n\2\3\2\5\2b\n\2\3\2\5\2e"+
-		"\n\2\3\2\3\2\3\3\3\3\5\3k\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6"+
-		"\3\6\3\7\3\7\3\7\3\7\3\7\7\7}\n\7\f\7\16\7\u0080\13\7\3\b\3\b\5\b\u0084"+
-		"\n\b\3\b\5\b\u0087\n\b\3\t\3\t\3\t\3\t\5\t\u008d\n\t\3\n\3\n\3\13\3\13"+
-		"\3\13\5\13\u0094\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u009b\n\r\3\r\3\r\5\r\u009f"+
-		"\n\r\3\16\3\16\3\16\3\16\3\17\3\17\3\17\7\17\u00a8\n\17\f\17\16\17\u00ab"+
-		"\13\17\3\20\3\20\3\20\5\20\u00b0\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3"+
-		"\23\3\23\5\23\u00ba\n\23\3\24\3\24\5\24\u00be\n\24\3\25\3\25\5\25\u00c2"+
-		"\n\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\7\27\u00cb\n\27\f\27\16\27\u00ce"+
-		"\13\27\3\30\3\30\3\30\7\30\u00d3\n\30\f\30\16\30\u00d6\13\30\3\31\5\31"+
-		"\u00d9\n\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e2\n\32\3\33\3"+
-		"\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00f2"+
-		"\n\33\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fd\n\35\f\35"+
-		"\16\35\u0100\13\35\3\35\3\35\5\35\u0104\n\35\3\36\3\36\3\36\3\36\3\36"+
-		"\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\5"+
-		"!\u011d\n!\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3\"\5\"\u0127\n\"\3#\3#\3#\3#\3"+
-		"#\5#\u012e\n#\3$\3$\3$\3$\3$\3$\3$\3$\5$\u0138\n$\3%\3%\3%\3%\3&\3&\3"+
-		"\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\5\'\u0148\n\'\3(\3(\3)\3)\5)\u014e\n)\3"+
-		"*\3*\3*\2\2+\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64"+
-		"\668:<>@BDFHJLNPR\2\6\3\2\16\17\3\2&-\3\2.>\4\2ABFF\2\u0153\2U\3\2\2\2"+
-		"\4h\3\2\2\2\6p\3\2\2\2\br\3\2\2\2\nt\3\2\2\2\fw\3\2\2\2\16\u0081\3\2\2"+
-		"\2\20\u008c\3\2\2\2\22\u008e\3\2\2\2\24\u0090\3\2\2\2\26\u0095\3\2\2\2"+
-		"\30\u0098\3\2\2\2\32\u00a0\3\2\2\2\34\u00a4\3\2\2\2\36\u00af\3\2\2\2 "+
-		"\u00b1\3\2\2\2\"\u00b4\3\2\2\2$\u00b9\3\2\2\2&\u00bb\3\2\2\2(\u00bf\3"+
-		"\2\2\2*\u00c3\3\2\2\2,\u00c7\3\2\2\2.\u00cf\3\2\2\2\60\u00d8\3\2\2\2\62"+
-		"\u00e1\3\2\2\2\64\u00f1\3\2\2\2\66\u00f3\3\2\2\28\u0103\3\2\2\2:\u0105"+
-		"\3\2\2\2<\u010b\3\2\2\2>\u0111\3\2\2\2@\u011c\3\2\2\2B\u0126\3\2\2\2D"+
-		"\u012d\3\2\2\2F\u0137\3\2\2\2H\u0139\3\2\2\2J\u013d\3\2\2\2L\u0147\3\2"+
-		"\2\2N\u0149\3\2\2\2P\u014d\3\2\2\2R\u014f\3\2\2\2TV\5\4\3\2UT\3\2\2\2"+
-		"UV\3\2\2\2VZ\3\2\2\2WY\5\b\5\2XW\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2Z[\3\2\2"+
-		"\2[^\3\2\2\2\\Z\3\2\2\2]_\5\n\6\2^]\3\2\2\2^_\3\2\2\2_a\3\2\2\2`b\5\f"+
-		"\7\2a`\3\2\2\2ab\3\2\2\2bd\3\2\2\2ce\5\24\13\2dc\3\2\2\2de\3\2\2\2ef\3"+
-		"\2\2\2fg\7\2\2\3g\3\3\2\2\2hj\7\3\2\2ik\5\6\4\2ji\3\2\2\2jk\3\2\2\2kl"+
-		"\3\2\2\2lm\7\4\2\2mn\5\34\17\2no\7\5\2\2o\5\3\2\2\2pq\7\6\2\2q\7\3\2\2"+
-		"\2rs\5\30\r\2s\t\3\2\2\2tu\7\7\2\2uv\5,\27\2v\13\3\2\2\2wx\7\b\2\2xy\7"+
-		"\t\2\2y~\5\16\b\2z{\7\n\2\2{}\5\16\b\2|z\3\2\2\2}\u0080\3\2\2\2~|\3\2"+
-		"\2\2~\177\3\2\2\2\177\r\3\2\2\2\u0080~\3\2\2\2\u0081\u0083\7@\2\2\u0082"+
-		"\u0084\5\22\n\2\u0083\u0082\3\2\2\2\u0083\u0084\3\2\2\2\u0084\u0086\3"+
-		"\2\2\2\u0085\u0087\5\20\t\2\u0086\u0085\3\2\2\2\u0086\u0087\3\2\2\2\u0087"+
-		"\17\3\2\2\2\u0088\u0089\7\13\2\2\u0089\u008d\7\f\2\2\u008a\u008b\7\13"+
-		"\2\2\u008b\u008d\7\r\2\2\u008c\u0088\3\2\2\2\u008c\u008a\3\2\2\2\u008d"+
-		"\21\3\2\2\2\u008e\u008f\t\2\2\2\u008f\23\3\2\2\2\u0090\u0091\7\20\2\2"+
-		"\u0091\u0093\7B\2\2\u0092\u0094\5\26\f\2\u0093\u0092\3\2\2\2\u0093\u0094"+
-		"\3\2\2\2\u0094\25\3\2\2\2\u0095\u0096\7\21\2\2\u0096\u0097\7B\2\2\u0097"+
-		"\27\3\2\2\2\u0098\u009a\7\22\2\2\u0099\u009b\5$\23\2\u009a\u0099\3\2\2"+
-		"\2\u009a\u009b\3\2\2\2\u009b\u009c\3\2\2\2\u009c\u009e\7@\2\2\u009d\u009f"+
-		"\5\32\16\2\u009e\u009d\3\2\2\2\u009e\u009f\3\2\2\2\u009f\31\3\2\2\2\u00a0"+
-		"\u00a1\7\4\2\2\u00a1\u00a2\5\34\17\2\u00a2\u00a3\7\5\2\2\u00a3\33\3\2"+
-		"\2\2\u00a4\u00a9\5\36\20\2\u00a5\u00a6\7\n\2\2\u00a6\u00a8\5\36\20\2\u00a7"+
-		"\u00a5\3\2\2\2\u00a8\u00ab\3\2\2\2\u00a9\u00a7\3\2\2\2\u00a9\u00aa\3\2"+
-		"\2\2\u00aa\35\3\2\2\2\u00ab\u00a9\3\2\2\2\u00ac\u00b0\7@\2\2\u00ad\u00b0"+
-		"\5 \21\2\u00ae\u00b0\5\"\22\2\u00af\u00ac\3\2\2\2\u00af\u00ad\3\2\2\2"+
-		"\u00af\u00ae\3\2\2\2\u00b0\37\3\2\2\2\u00b1\u00b2\7\23\2\2\u00b2\u00b3"+
-		"\5&\24\2\u00b3!\3\2\2\2\u00b4\u00b5\7\23\2\2\u00b5\u00b6\5(\25\2\u00b6"+
-		"#\3\2\2\2\u00b7\u00ba\5&\24\2\u00b8\u00ba\5(\25\2\u00b9\u00b7\3\2\2\2"+
-		"\u00b9\u00b8\3\2\2\2\u00ba%\3\2\2\2\u00bb\u00bd\7\24\2\2\u00bc\u00be\5"+
-		"*\26\2\u00bd\u00bc\3\2\2\2\u00bd\u00be\3\2\2\2\u00be\'\3\2\2\2\u00bf\u00c1"+
-		"\7\25\2\2\u00c0\u00c2\5*\26\2\u00c1\u00c0\3\2\2\2\u00c1\u00c2\3\2\2\2"+
-		"\u00c2)\3\2\2\2\u00c3\u00c4\7\4\2\2\u00c4\u00c5\7B\2\2\u00c5\u00c6\7\5"+
-		"\2\2\u00c6+\3\2\2\2\u00c7\u00cc\5.\30\2\u00c8\u00c9\7\26\2\2\u00c9\u00cb"+
-		"\5.\30\2\u00ca\u00c8\3\2\2\2\u00cb\u00ce\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cc"+
-		"\u00cd\3\2\2\2\u00cd-\3\2\2\2\u00ce\u00cc\3\2\2\2\u00cf\u00d4\5\60\31"+
-		"\2\u00d0\u00d1\7\27\2\2\u00d1\u00d3\5\60\31\2\u00d2\u00d0\3\2\2\2\u00d3"+
-		"\u00d6\3\2\2\2\u00d4\u00d2\3\2\2\2\u00d4\u00d5\3\2\2\2\u00d5/\3\2\2\2"+
-		"\u00d6\u00d4\3\2\2\2\u00d7\u00d9\7\30\2\2\u00d8\u00d7\3\2\2\2\u00d8\u00d9"+
-		"\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\u00db\5\62\32\2\u00db\61\3\2\2\2\u00dc"+
-		"\u00e2\5\64\33\2\u00dd\u00de\7\4\2\2\u00de\u00df\5,\27\2\u00df\u00e0\7"+
-		"\5\2\2\u00e0\u00e2\3\2\2\2\u00e1\u00dc\3\2\2\2\u00e1\u00dd\3\2\2\2\u00e2"+
-		"\63\3\2\2\2\u00e3\u00f2\5L\'\2\u00e4\u00f2\5H%\2\u00e5\u00f2\5<\37\2\u00e6"+
-		"\u00f2\5:\36\2\u00e7\u00f2\5> \2\u00e8\u00f2\5\66\34\2\u00e9\u00f2\5@"+
-		"!\2\u00ea\u00f2\5B\"\2\u00eb\u00f2\5D#\2\u00ec\u00f2\5F$\2\u00ed\u00ee"+
-		"\7\4\2\2\u00ee\u00ef\5\64\33\2\u00ef\u00f0\7\5\2\2\u00f0\u00f2\3\2\2\2"+
-		"\u00f1\u00e3\3\2\2\2\u00f1\u00e4\3\2\2\2\u00f1\u00e5\3\2\2\2\u00f1\u00e6"+
-		"\3\2\2\2\u00f1\u00e7\3\2\2\2\u00f1\u00e8\3\2\2\2\u00f1\u00e9\3\2\2\2\u00f1"+
-		"\u00ea\3\2\2\2\u00f1\u00eb\3\2\2\2\u00f1\u00ec\3\2\2\2\u00f1\u00ed\3\2"+
-		"\2\2\u00f2\65\3\2\2\2\u00f3\u00f4\7@\2\2\u00f4\u00f5\7\31\2\2\u00f5\u00f6"+
-		"\58\35\2\u00f6\67\3\2\2\2\u00f7\u0104\7?\2\2\u00f8\u00f9\7\4\2\2\u00f9"+
-		"\u00fe\5P)\2\u00fa\u00fb\7\n\2\2\u00fb\u00fd\5P)\2\u00fc\u00fa\3\2\2\2"+
-		"\u00fd\u0100\3\2\2\2\u00fe\u00fc\3\2\2\2\u00fe\u00ff\3\2\2\2\u00ff\u0101"+
-		"\3\2\2\2\u0100\u00fe\3\2\2\2\u0101\u0102\7\5\2\2\u0102\u0104\3\2\2\2\u0103"+
-		"\u00f7\3\2\2\2\u0103\u00f8\3\2\2\2\u01049\3\2\2\2\u0105\u0106\7@\2\2\u0106"+
-		"\u0107\7\32\2\2\u0107\u0108\5P)\2\u0108\u0109\7\27\2\2\u0109\u010a\5P"+
-		")\2\u010a;\3\2\2\2\u010b\u010c\7@\2\2\u010c\u010d\7\33\2\2\u010d\u010e"+
-		"\5P)\2\u010e\u010f\7\34\2\2\u010f\u0110\5P)\2\u0110=\3\2\2\2\u0111\u0112"+
-		"\5P)\2\u0112\u0113\7\32\2\2\u0113\u0114\7@\2\2\u0114\u0115\7\27\2\2\u0115"+
-		"\u0116\7@\2\2\u0116?\3\2\2\2\u0117\u0118\7@\2\2\u0118\u0119\7\35\2\2\u0119"+
-		"\u011d\7\36\2\2\u011a\u011b\7@\2\2\u011b\u011d\7\37\2\2\u011c\u0117\3"+
-		"\2\2\2\u011c\u011a\3\2\2\2\u011dA\3\2\2\2\u011e\u011f\7@\2\2\u011f\u0120"+
-		"\7\35\2\2\u0120\u0121\7\30\2\2\u0121\u0127\7\36\2\2\u0122\u0123\7@\2\2"+
-		"\u0123\u0127\7 \2\2\u0124\u0125\7@\2\2\u0125\u0127\7!\2\2\u0126\u011e"+
-		"\3\2\2\2\u0126\u0122\3\2\2\2\u0126\u0124\3\2\2\2\u0127C\3\2\2\2\u0128"+
-		"\u0129\7@\2\2\u0129\u012a\7\35\2\2\u012a\u012e\7\"\2\2\u012b\u012c\7@"+
-		"\2\2\u012c\u012e\7#\2\2\u012d\u0128\3\2\2\2\u012d\u012b\3\2\2\2\u012e"+
-		"E\3\2\2\2\u012f\u0130\7@\2\2\u0130\u0131\7\35\2\2\u0131\u0132\7\30\2\2"+
-		"\u0132\u0138\7\"\2\2\u0133\u0134\7@\2\2\u0134\u0138\7$\2\2\u0135\u0136"+
-		"\7@\2\2\u0136\u0138\7%\2\2\u0137\u012f\3\2\2\2\u0137\u0133\3\2\2\2\u0137"+
-		"\u0135\3\2\2\2\u0138G\3\2\2\2\u0139\u013a\7@\2\2\u013a\u013b\5J&\2\u013b"+
-		"\u013c\5P)\2\u013cI\3\2\2\2\u013d\u013e\t\3\2\2\u013eK\3\2\2\2\u013f\u0140"+
-		"\7@\2\2\u0140\u0141\5N(\2\u0141\u0142\5P)\2\u0142\u0148\3\2\2\2\u0143"+
-		"\u0144\5P)\2\u0144\u0145\5N(\2\u0145\u0146\7@\2\2\u0146\u0148\3\2\2\2"+
-		"\u0147\u013f\3\2\2\2\u0147\u0143\3\2\2\2\u0148M\3\2\2\2\u0149\u014a\t"+
-		"\4\2\2\u014aO\3\2\2\2\u014b\u014e\5R*\2\u014c\u014e\7?\2\2\u014d\u014b"+
-		"\3\2\2\2\u014d\u014c\3\2\2\2\u014eQ\3\2\2\2\u014f\u0150\t\5\2\2\u0150"+
-		"S\3\2\2\2!UZ^adj~\u0083\u0086\u008c\u0093\u009a\u009e\u00a9\u00af\u00b9"+
-		"\u00bd\u00c1\u00cc\u00d4\u00d8\u00e1\u00f1\u00fe\u0103\u011c\u0126\u012d"+
-		"\u0137\u0147\u014d";
+		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
+		",\t,\3\2\5\2Z\n\2\3\2\7\2]\n\2\f\2\16\2`\13\2\3\2\5\2c\n\2\3\2\5\2f\n"+
+		"\2\3\2\5\2i\n\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\5\3r\n\3\3\4\3\4\5\4v\n\4"+
+		"\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b\7\b\u0086\n\b"+
+		"\f\b\16\b\u0089\13\b\3\t\3\t\5\t\u008d\n\t\3\t\5\t\u0090\n\t\3\n\3\n\3"+
+		"\n\3\n\5\n\u0096\n\n\3\13\3\13\3\f\3\f\3\f\5\f\u009d\n\f\3\r\3\r\3\r\3"+
+		"\16\3\16\5\16\u00a4\n\16\3\16\3\16\5\16\u00a8\n\16\3\17\3\17\3\17\3\17"+
+		"\3\20\3\20\3\20\7\20\u00b1\n\20\f\20\16\20\u00b4\13\20\3\21\3\21\3\22"+
+		"\3\22\3\22\3\22\5\22\u00bc\n\22\3\23\3\23\3\23\3\24\3\24\3\24\3\25\3\25"+
+		"\5\25\u00c6\n\25\3\26\3\26\5\26\u00ca\n\26\3\27\3\27\5\27\u00ce\n\27\3"+
+		"\30\3\30\3\30\3\30\3\31\3\31\3\31\7\31\u00d7\n\31\f\31\16\31\u00da\13"+
+		"\31\3\32\3\32\3\32\7\32\u00df\n\32\f\32\16\32\u00e2\13\32\3\33\5\33\u00e5"+
+		"\n\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\5\34\u00ee\n\34\3\35\3\35\3\35"+
+		"\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\5\35\u00fe\n\35"+
+		"\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\7\37\u0109\n\37\f\37\16"+
+		"\37\u010c\13\37\3\37\3\37\5\37\u0110\n\37\3 \3 \3 \3 \3 \3 \3!\3!\3!\3"+
+		"!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\5#\u0129\n#\3$\3$\3$\3"+
+		"$\3$\3$\3$\3$\5$\u0133\n$\3%\3%\3%\3%\3%\5%\u013a\n%\3&\3&\3&\3&\3&\3"+
+		"&\3&\3&\5&\u0144\n&\3\'\3\'\3\'\3\'\3(\3(\3)\3)\3)\3)\3)\3)\3)\3)\5)\u0154"+
+		"\n)\3*\3*\3+\3+\5+\u015a\n+\3,\3,\3,\2\2-\2\4\6\b\n\f\16\20\22\24\26\30"+
+		"\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNPRTV\2\7\3\2\16\17\3\2@A\3\2"+
+		"&-\3\2.>\4\2CDHH\2\u015f\2Y\3\2\2\2\4q\3\2\2\2\6s\3\2\2\2\by\3\2\2\2\n"+
+		"{\3\2\2\2\f}\3\2\2\2\16\u0080\3\2\2\2\20\u008a\3\2\2\2\22\u0095\3\2\2"+
+		"\2\24\u0097\3\2\2\2\26\u0099\3\2\2\2\30\u009e\3\2\2\2\32\u00a1\3\2\2\2"+
+		"\34\u00a9\3\2\2\2\36\u00ad\3\2\2\2 \u00b5\3\2\2\2\"\u00bb\3\2\2\2$\u00bd"+
+		"\3\2\2\2&\u00c0\3\2\2\2(\u00c5\3\2\2\2*\u00c7\3\2\2\2,\u00cb\3\2\2\2."+
+		"\u00cf\3\2\2\2\60\u00d3\3\2\2\2\62\u00db\3\2\2\2\64\u00e4\3\2\2\2\66\u00ed"+
+		"\3\2\2\28\u00fd\3\2\2\2:\u00ff\3\2\2\2<\u010f\3\2\2\2>\u0111\3\2\2\2@"+
+		"\u0117\3\2\2\2B\u011d\3\2\2\2D\u0128\3\2\2\2F\u0132\3\2\2\2H\u0139\3\2"+
+		"\2\2J\u0143\3\2\2\2L\u0145\3\2\2\2N\u0149\3\2\2\2P\u0153\3\2\2\2R\u0155"+
+		"\3\2\2\2T\u0159\3\2\2\2V\u015b\3\2\2\2XZ\5\6\4\2YX\3\2\2\2YZ\3\2\2\2Z"+
+		"^\3\2\2\2[]\5\n\6\2\\[\3\2\2\2]`\3\2\2\2^\\\3\2\2\2^_\3\2\2\2_b\3\2\2"+
+		"\2`^\3\2\2\2ac\5\f\7\2ba\3\2\2\2bc\3\2\2\2ce\3\2\2\2df\5\16\b\2ed\3\2"+
+		"\2\2ef\3\2\2\2fh\3\2\2\2gi\5\26\f\2hg\3\2\2\2hi\3\2\2\2ij\3\2\2\2jk\7"+
+		"\2\2\3k\3\3\2\2\2lm\7\3\2\2mn\5\36\20\2no\7\4\2\2or\3\2\2\2pr\5\36\20"+
+		"\2ql\3\2\2\2qp\3\2\2\2r\5\3\2\2\2su\7\5\2\2tv\5\b\5\2ut\3\2\2\2uv\3\2"+
+		"\2\2vw\3\2\2\2wx\5\4\3\2x\7\3\2\2\2yz\7\6\2\2z\t\3\2\2\2{|\5\32\16\2|"+
+		"\13\3\2\2\2}~\7\7\2\2~\177\5\60\31\2\177\r\3\2\2\2\u0080\u0081\7\b\2\2"+
+		"\u0081\u0082\7\t\2\2\u0082\u0087\5\20\t\2\u0083\u0084\7\n\2\2\u0084\u0086"+
+		"\5\20\t\2\u0085\u0083\3\2\2\2\u0086\u0089\3\2\2\2\u0087\u0085\3\2\2\2"+
+		"\u0087\u0088\3\2\2\2\u0088\17\3\2\2\2\u0089\u0087\3\2\2\2\u008a\u008c"+
+		"\7@\2\2\u008b\u008d\5\24\13\2\u008c\u008b\3\2\2\2\u008c\u008d\3\2\2\2"+
+		"\u008d\u008f\3\2\2\2\u008e\u0090\5\22\n\2\u008f\u008e\3\2\2\2\u008f\u0090"+
+		"\3\2\2\2\u0090\21\3\2\2\2\u0091\u0092\7\13\2\2\u0092\u0096\7\f\2\2\u0093"+
+		"\u0094\7\13\2\2\u0094\u0096\7\r\2\2\u0095\u0091\3\2\2\2\u0095\u0093\3"+
+		"\2\2\2\u0096\23\3\2\2\2\u0097\u0098\t\2\2\2\u0098\25\3\2\2\2\u0099\u009a"+
+		"\7\20\2\2\u009a\u009c\7D\2\2\u009b\u009d\5\30\r\2\u009c\u009b\3\2\2\2"+
+		"\u009c\u009d\3\2\2\2\u009d\27\3\2\2\2\u009e\u009f\7\21\2\2\u009f\u00a0"+
+		"\7D\2\2\u00a0\31\3\2\2\2\u00a1\u00a3\7\22\2\2\u00a2\u00a4\5(\25\2\u00a3"+
+		"\u00a2\3\2\2\2\u00a3\u00a4\3\2\2\2\u00a4\u00a5\3\2\2\2\u00a5\u00a7\5 "+
+		"\21\2\u00a6\u00a8\5\34\17\2\u00a7\u00a6\3\2\2\2\u00a7\u00a8\3\2\2\2\u00a8"+
+		"\33\3\2\2\2\u00a9\u00aa\7\3\2\2\u00aa\u00ab\5\36\20\2\u00ab\u00ac\7\4"+
+		"\2\2\u00ac\35\3\2\2\2\u00ad\u00b2\5\"\22\2\u00ae\u00af\7\n\2\2\u00af\u00b1"+
+		"\5\"\22\2\u00b0\u00ae\3\2\2\2\u00b1\u00b4\3\2\2\2\u00b2\u00b0\3\2\2\2"+
+		"\u00b2\u00b3\3\2\2\2\u00b3\37\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b5\u00b6"+
+		"\t\3\2\2\u00b6!\3\2\2\2\u00b7\u00bc\7@\2\2\u00b8\u00bc\5$\23\2\u00b9\u00bc"+
+		"\5&\24\2\u00ba\u00bc\7B\2\2\u00bb\u00b7\3\2\2\2\u00bb\u00b8\3\2\2\2\u00bb"+
+		"\u00b9\3\2\2\2\u00bb\u00ba\3\2\2\2\u00bc#\3\2\2\2\u00bd\u00be\7\23\2\2"+
+		"\u00be\u00bf\5*\26\2\u00bf%\3\2\2\2\u00c0\u00c1\7\23\2\2\u00c1\u00c2\5"+
+		",\27\2\u00c2\'\3\2\2\2\u00c3\u00c6\5*\26\2\u00c4\u00c6\5,\27\2\u00c5\u00c3"+
+		"\3\2\2\2\u00c5\u00c4\3\2\2\2\u00c6)\3\2\2\2\u00c7\u00c9\7\24\2\2\u00c8"+
+		"\u00ca\5.\30\2\u00c9\u00c8\3\2\2\2\u00c9\u00ca\3\2\2\2\u00ca+\3\2\2\2"+
+		"\u00cb\u00cd\7\25\2\2\u00cc\u00ce\5.\30\2\u00cd\u00cc\3\2\2\2\u00cd\u00ce"+
+		"\3\2\2\2\u00ce-\3\2\2\2\u00cf\u00d0\7\3\2\2\u00d0\u00d1\7D\2\2\u00d1\u00d2"+
+		"\7\4\2\2\u00d2/\3\2\2\2\u00d3\u00d8\5\62\32\2\u00d4\u00d5\7\26\2\2\u00d5"+
+		"\u00d7\5\62\32\2\u00d6\u00d4\3\2\2\2\u00d7\u00da\3\2\2\2\u00d8\u00d6\3"+
+		"\2\2\2\u00d8\u00d9\3\2\2\2\u00d9\61\3\2\2\2\u00da\u00d8\3\2\2\2\u00db"+
+		"\u00e0\5\64\33\2\u00dc\u00dd\7\27\2\2\u00dd\u00df\5\64\33\2\u00de\u00dc"+
+		"\3\2\2\2\u00df\u00e2\3\2\2\2\u00e0\u00de\3\2\2\2\u00e0\u00e1\3\2\2\2\u00e1"+
+		"\63\3\2\2\2\u00e2\u00e0\3\2\2\2\u00e3\u00e5\7\30\2\2\u00e4\u00e3\3\2\2"+
+		"\2\u00e4\u00e5\3\2\2\2\u00e5\u00e6\3\2\2\2\u00e6\u00e7\5\66\34\2\u00e7"+
+		"\65\3\2\2\2\u00e8\u00ee\58\35\2\u00e9\u00ea\7\3\2\2\u00ea\u00eb\5\60\31"+
+		"\2\u00eb\u00ec\7\4\2\2\u00ec\u00ee\3\2\2\2\u00ed\u00e8\3\2\2\2\u00ed\u00e9"+
+		"\3\2\2\2\u00ee\67\3\2\2\2\u00ef\u00fe\5P)\2\u00f0\u00fe\5L\'\2\u00f1\u00fe"+
+		"\5@!\2\u00f2\u00fe\5> \2\u00f3\u00fe\5B\"\2\u00f4\u00fe\5:\36\2\u00f5"+
+		"\u00fe\5D#\2\u00f6\u00fe\5F$\2\u00f7\u00fe\5H%\2\u00f8\u00fe\5J&\2\u00f9"+
+		"\u00fa\7\3\2\2\u00fa\u00fb\58\35\2\u00fb\u00fc\7\4\2\2\u00fc\u00fe\3\2"+
+		"\2\2\u00fd\u00ef\3\2\2\2\u00fd\u00f0\3\2\2\2\u00fd\u00f1\3\2\2\2\u00fd"+
+		"\u00f2\3\2\2\2\u00fd\u00f3\3\2\2\2\u00fd\u00f4\3\2\2\2\u00fd\u00f5\3\2"+
+		"\2\2\u00fd\u00f6\3\2\2\2\u00fd\u00f7\3\2\2\2\u00fd\u00f8\3\2\2\2\u00fd"+
+		"\u00f9\3\2\2\2\u00fe9\3\2\2\2\u00ff\u0100\7@\2\2\u0100\u0101\7\31\2\2"+
+		"\u0101\u0102\5<\37\2\u0102;\3\2\2\2\u0103\u0110\7?\2\2\u0104\u0105\7\3"+
+		"\2\2\u0105\u010a\5T+\2\u0106\u0107\7\n\2\2\u0107\u0109\5T+\2\u0108\u0106"+
+		"\3\2\2\2\u0109\u010c\3\2\2\2\u010a\u0108\3\2\2\2\u010a\u010b\3\2\2\2\u010b"+
+		"\u010d\3\2\2\2\u010c\u010a\3\2\2\2\u010d\u010e\7\4\2\2\u010e\u0110\3\2"+
+		"\2\2\u010f\u0103\3\2\2\2\u010f\u0104\3\2\2\2\u0110=\3\2\2\2\u0111\u0112"+
+		"\7@\2\2\u0112\u0113\7\32\2\2\u0113\u0114\5T+\2\u0114\u0115\7\27\2\2\u0115"+
+		"\u0116\5T+\2\u0116?\3\2\2\2\u0117\u0118\7@\2\2\u0118\u0119\7\33\2\2\u0119"+
+		"\u011a\5T+\2\u011a\u011b\7\34\2\2\u011b\u011c\5T+\2\u011cA\3\2\2\2\u011d"+
+		"\u011e\5T+\2\u011e\u011f\7\32\2\2\u011f\u0120\7@\2\2\u0120\u0121\7\27"+
+		"\2\2\u0121\u0122\7@\2\2\u0122C\3\2\2\2\u0123\u0124\7@\2\2\u0124\u0125"+
+		"\7\35\2\2\u0125\u0129\7\36\2\2\u0126\u0127\7@\2\2\u0127\u0129\7\37\2\2"+
+		"\u0128\u0123\3\2\2\2\u0128\u0126\3\2\2\2\u0129E\3\2\2\2\u012a\u012b\7"+
+		"@\2\2\u012b\u012c\7\35\2\2\u012c\u012d\7\30\2\2\u012d\u0133\7\36\2\2\u012e"+
+		"\u012f\7@\2\2\u012f\u0133\7 \2\2\u0130\u0131\7@\2\2\u0131\u0133\7!\2\2"+
+		"\u0132\u012a\3\2\2\2\u0132\u012e\3\2\2\2\u0132\u0130\3\2\2\2\u0133G\3"+
+		"\2\2\2\u0134\u0135\7@\2\2\u0135\u0136\7\35\2\2\u0136\u013a\7\"\2\2\u0137"+
+		"\u0138\7@\2\2\u0138\u013a\7#\2\2\u0139\u0134\3\2\2\2\u0139\u0137\3\2\2"+
+		"\2\u013aI\3\2\2\2\u013b\u013c\7@\2\2\u013c\u013d\7\35\2\2\u013d\u013e"+
+		"\7\30\2\2\u013e\u0144\7\"\2\2\u013f\u0140\7@\2\2\u0140\u0144\7$\2\2\u0141"+
+		"\u0142\7@\2\2\u0142\u0144\7%\2\2\u0143\u013b\3\2\2\2\u0143\u013f\3\2\2"+
+		"\2\u0143\u0141\3\2\2\2\u0144K\3\2\2\2\u0145\u0146\7@\2\2\u0146\u0147\5"+
+		"N(\2\u0147\u0148\5T+\2\u0148M\3\2\2\2\u0149\u014a\t\4\2\2\u014aO\3\2\2"+
+		"\2\u014b\u014c\7@\2\2\u014c\u014d\5R*\2\u014d\u014e\5T+\2\u014e\u0154"+
+		"\3\2\2\2\u014f\u0150\5T+\2\u0150\u0151\5R*\2\u0151\u0152\7@\2\2\u0152"+
+		"\u0154\3\2\2\2\u0153\u014b\3\2\2\2\u0153\u014f\3\2\2\2\u0154Q\3\2\2\2"+
+		"\u0155\u0156\t\5\2\2\u0156S\3\2\2\2\u0157\u015a\5V,\2\u0158\u015a\7?\2"+
+		"\2\u0159\u0157\3\2\2\2\u0159\u0158\3\2\2\2\u015aU\3\2\2\2\u015b\u015c"+
+		"\t\6\2\2\u015cW\3\2\2\2\"Y^behqu\u0087\u008c\u008f\u0095\u009c\u00a3\u00a7"+
+		"\u00b2\u00bb\u00c5\u00c9\u00cd\u00d8\u00e0\u00e4\u00ed\u00fd\u010a\u010f"+
+		"\u0128\u0132\u0139\u0143\u0153\u0159";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 0ed479085..5186f9b20 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -7,8 +7,10 @@ import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiQuery;
+import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 
 import java.util.Arrays;
@@ -221,14 +223,13 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where not (t0.name = ?  and t0.status = ? )");
   }
 
-
   @Test
   public void where_in() {
 
     Query<Customer> query = parse("where name in ('Rob','Jim')");
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -239,7 +240,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("two", "Bar");
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -250,7 +251,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("two", "Bar");
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -261,7 +262,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("two", "Bar");
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -271,7 +272,7 @@ public class EqlParserTest extends BaseTestCase {
     query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim"));
     query.findList();
 
-    platformAssertIn(query.getGeneratedSql(),"where t0.name");
+    platformAssertIn(query.getGeneratedSql(), "where t0.name");
   }
 
   @Test
@@ -333,6 +334,79 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where  ? between t0.name and t0.smallnote");
   }
 
+  @Test
+  public void selectFetch_basic() {
+
+    Query<Customer> query = parse("select name fetch billingAddress");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.line_2, t1.city, t1.cretime, t1.updtime, t1.country_code from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id");
+  }
+
+  @Test
+  public void selectFetch_basic2() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = parse("select name, status fetch billingAddress");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("select t0.id, t0.name, t0.status, t1.id, t1.line_1, t1.line_2, t1.city, t1.cretime, t1.updtime, t1.country_code from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id");
+  }
+
+  @Test
+  public void selectFetch_withProperties() {
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) ");
+    query.findList();
+
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id");
+  }
+
+  @Test
+  public void selectFetchFetchLimit() {
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch shippingAddress (line1) limit 10");
+    query.findList();
+
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city, t2.id, t2.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id  left join o_address t2 on t2.id = t0.shipping_address_id  order by t0.id");
+  }
+
+  @Test
+  public void selectFetchFetchMany() {
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts");
+    query.findList();
+
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city, t2.id, t2.first_name, t2.last_name, t2.phone, t2.mobile, t2.email, t2.cretime, t2.updtime, t2.customer_id, t2.group_id from o_customer t0");
+  }
+
+
+  @Test
+  public void selectFetchFetchManyProperties() {
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts (email)");
+    query.findList();
+
+    assertThat(sqlOf(query, 12)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city, t2.id, t2.email from o_customer t0");
+  }
+
+  @Test
+  public void selectFetchFetchManyPropertiesLimit() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts (email) limit 10");
+    query.findList();
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city from o_customer t0 left join o_address");
+    assertThat(sql.get(1)).contains("select t0.customer_id, t0.id, t0.email from contact t0 where (t0.customer_id) in");
+  }
+
   @Test
   public void fetch_basic() {
 
@@ -438,6 +512,58 @@ public class EqlParserTest extends BaseTestCase {
     Query<Customer> query = parse("select (name)");
     query.findList();
     assertThat(sqlOf(query, 1)).contains("select t0.id, t0.name from o_customer t0");
+
+    Query<Customer> query2 = parse("select name");
+    query2.findList();
+    assertThat(sqlOf(query2, 1)).contains("select t0.id, t0.name from o_customer t0");
+  }
+
+  @Test
+  public void select_sum() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = parse("select (sum(id))");
+    query.findSingleAttribute();
+    assertThat(sqlOf(query, 1)).contains("select sum(t0.id) from o_customer t0");
+  }
+
+  @Test
+  public void select_max() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = parse("select (max(cretime))");
+    query.findSingleAttribute();
+    assertThat(sqlOf(query, 1)).contains("select max(t0.cretime) from o_customer t0");
+
+    Query<Customer> query2 = parse("select max(cretime)");
+    query2.findSingleAttribute();
+    assertThat(sqlOf(query2, 1)).contains("select max(t0.cretime) from o_customer t0");
+  }
+
+  @Test
+  public void select_agg() {
+
+    ResetBasicData.reset();
+
+    Query<Customer> query = parse("select status, max(cretime)");
+    List<Customer> customers = query.findList();
+
+    assertThat(customers).isNotEmpty();
+    assertThat(sqlOf(query, 1)).contains("select t0.status, max(t0.cretime) from o_customer t0 group by t0.status");
+  }
+
+  @Test
+  public void select_agg_sum() {
+
+    ResetBasicData.reset();
+
+    Query<OrderDetail> query = Ebean.createQuery(OrderDetail.class, "select sum(orderQty) fetch `order` (id)");
+    List<OrderDetail> details = query.findList();
+
+    assertThat(details).isNotEmpty();
+    assertThat(sqlOf(query, 1)).contains("select sum(t0.order_qty), t1.id from o_order_detail t0 join o_order t1 on t1.id = t0.order_id  group by t1.id");
   }
 
   @Test
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index c017775e1..3b6d1d702 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -4,8 +4,13 @@ select_statement
    : select_clause? fetch_clause* where_clause? orderby_clause? limit_clause? EOF
    ;
 
+select_properties
+   : '(' fetch_property_group ')'
+   | fetch_property_group
+   ;
+
 select_clause
-   : 'select' distinct? '(' fetch_property_group ')'
+   : 'select' distinct? select_properties
    ;
 
 distinct
@@ -47,7 +52,7 @@ offset_clause
    ;
 
 fetch_path
-   : 'fetch' fetch_option? PATH_VARIABLE fetch_property_set?
+   : 'fetch' fetch_option? fetch_path_path fetch_property_set?
    ;
 
 fetch_property_set
@@ -58,10 +63,16 @@ fetch_property_group
    : fetch_property (',' fetch_property)*
    ;
 
+fetch_path_path
+   : PATH_VARIABLE
+   | QUOTED_PATH_VARIABLE
+   ;
+
 fetch_property
    : PATH_VARIABLE
    | fetch_query_hint
    | fetch_lazy_hint
+   | PROP_FORMULA
    ;
 
 fetch_query_hint
@@ -210,6 +221,18 @@ PATH_VARIABLE
    : ('a' .. 'z' | 'A' .. 'Z' | '_') ('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '.')*
    ;
 
+QUOTED_PATH_VARIABLE
+   : ('`')(PATH_VARIABLE)('`')
+   ;
+
+PROP_FORMULA
+   : 'sum(' PATH_VARIABLE ')'
+   | 'max(' PATH_VARIABLE ')'
+   | 'min(' PATH_VARIABLE ')'
+   | 'avg(' PATH_VARIABLE ')'
+   | 'count(' PATH_VARIABLE ')'
+   ;
+
 BOOLEAN_LITERAL
    : 'true'
    | 'false'