diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java
index 7c02fbe99..17f2e74a1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java
@@ -97,6 +97,13 @@ class EqlAdapter<T> extends EQLBaseListener {
   @Override
   public void enterBetween_expression(EQLParser.Between_expressionContext ctx) {
 
+    checkChildren(ctx, 5);
+    String path = getLeftHandSidePath(ctx);
+    EqlOperator op = getOperator(ctx);
+    if (op != EqlOperator.BETWEEN) {
+      throw new IllegalStateException("Expecting BETWEEN operator but got "+op);
+    }
+    helper.addBetween(path, ctx.getChild(2).getText(), ctx.getChild(4).getText());
   }
 
   @Override
@@ -222,6 +229,25 @@ class EqlAdapter<T> extends EQLBaseListener {
     }
   }
 
+  private EqlOperator getOperator(ParserRuleContext ctx) {
+    // the operator text which may be a variation
+    String operator = ctx.getChild(1).getText();
+    EqlOperator op = operatorMapping.get(operator);
+    if (op == null) {
+      throw new IllegalStateException("No operator found for " + operator);
+    }
+    return op;
+  }
+
+  /**
+   * Check for the minimum number of children.
+   */
+  private void checkChildren(ParserRuleContext ctx, int min) {
+    if (ctx.getChildCount() < min) {
+      throw new IllegalStateException("expecting " + min + " children for comparison? " + ctx);
+    }
+  }
+
   public Object namedParam(String parameterName) {
     return query.createNamedParameter(parameterName);
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java
index ce49f5dfe..9b15daf05 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java
@@ -41,6 +41,10 @@ class EqlAdapterHelper {
     }
   }
 
+  protected void addBetween(String path, String value1, String value2) {
+    peekExprList().between(path, bind(value1), bind(value2));
+  }
+
   @SuppressWarnings("unchecked")
   protected void addIn(String path, List<Object> inValues) {
     peekExprList().in(path, inValues);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlOperator.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlOperator.java
index 2fc5c3a52..70f2b1410 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlOperator.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlOperator.java
@@ -16,6 +16,7 @@ enum EqlOperator {
   ICONTAINS,
   ISTARTS_WITH,
   IENDS_WITH,
-  ILIKE
+  ILIKE,
+  BETWEEN
 
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java
index 43ac91093..2e19dd512 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java
@@ -40,6 +40,7 @@ class OperatorMapping {
     map.put("iendsWith", EqlOperator.IENDS_WITH);
     map.put("ilike", EqlOperator.ILIKE);
 
+    map.put("between", EqlOperator.BETWEEN);
   }
 
   public EqlOperator get(String key) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQL.tokens
index 29cd61604..174ef1964 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQL.tokens
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQL.tokens
@@ -44,12 +44,10 @@ T__42=43
 T__43=44
 INPUT_VARIABLE=45
 PATH_VARIABLE=46
-CHARACTER=47
-BOOLEAN_LITERAL=48
-NUMBER_LITERAL=49
-STRING_LITERAL=50
-ESCAPE_CHARACTER=51
-WS=52
+BOOLEAN_LITERAL=47
+NUMBER_LITERAL=48
+STRING_LITERAL=49
+WS=50
 'select'=1
 '('=2
 ')'=3
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index a4bc3fbbc..112c6a773 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.1
+// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.3
 package com.avaje.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.ParserRuleContext;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.java
index 62bd17a20..9bdd6d282 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.1
+// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.3
 package com.avaje.ebeaninternal.server.grammer.antlr;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
@@ -11,7 +11,7 @@ import org.antlr.v4.runtime.misc.*;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class EQLLexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
+	static { RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION); }
 
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =
@@ -23,8 +23,8 @@ public class EQLLexer extends Lexer {
 		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31, 
 		T__31=32, T__32=33, T__33=34, T__34=35, T__35=36, T__36=37, T__37=38, 
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, INPUT_VARIABLE=45, 
-		PATH_VARIABLE=46, CHARACTER=47, BOOLEAN_LITERAL=48, NUMBER_LITERAL=49, 
-		STRING_LITERAL=50, ESCAPE_CHARACTER=51, WS=52;
+		PATH_VARIABLE=46, BOOLEAN_LITERAL=47, NUMBER_LITERAL=48, STRING_LITERAL=49, 
+		WS=50;
 	public static String[] modeNames = {
 		"DEFAULT_MODE"
 	};
@@ -35,9 +35,8 @@ public class EQLLexer extends Lexer {
 		"T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "T__23", "T__24", 
 		"T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32", 
 		"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40", 
-		"T__41", "T__42", "T__43", "INPUT_VARIABLE", "PATH_VARIABLE", "CHARACTER", 
-		"BOOLEAN_LITERAL", "NUMBER_LITERAL", "STRING_LITERAL", "ESCAPE_CHARACTER", 
-		"WS"
+		"T__41", "T__42", "T__43", "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", 
+		"NUMBER_LITERAL", "STRING_LITERAL", "WS"
 	};
 
 	private static final String[] _LITERAL_NAMES = {
@@ -54,8 +53,8 @@ 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, "INPUT_VARIABLE", 
-		"PATH_VARIABLE", "CHARACTER", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "STRING_LITERAL", 
-		"ESCAPE_CHARACTER", "WS"
+		"PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "STRING_LITERAL", 
+		"WS"
 	};
 	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
@@ -112,38 +111,37 @@ public class EQLLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\66\u0192\b\1\4\2"+
+		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\64\u0188\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\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*\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\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\6\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\t"+
-		"\3\t\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\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\17"+
-		"\3\20\3\20\3\20\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\21\3\21\3\22\3\22\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23"+
-		"\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24"+
-		"\3\24\3\25\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\27\3\27\3\27\3\27\3\27\3\27\3\30\3\30\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\32\3\32\3\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\34\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\36\3\36"+
-		"\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.\7.\u0159\n.\f.\16.\u015c\13.\3/\3/\7/\u0160\n/\f"+
-		"/\16/\u0163\13/\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\61\3\61\3\61"+
-		"\3\61\3\61\5\61\u0172\n\61\3\62\6\62\u0175\n\62\r\62\16\62\u0176\3\62"+
-		"\5\62\u017a\n\62\3\62\7\62\u017d\n\62\f\62\16\62\u0180\13\62\3\63\3\63"+
-		"\3\63\3\63\7\63\u0186\n\63\f\63\16\63\u0189\13\63\3\63\3\63\3\64\3\64"+
-		"\3\65\3\65\3\65\3\65\2\2\66\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\66\3\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\a"+
-		"ac|\4\2))^^\3\2\62;\3\2))\5\2\13\f\17\17\"\"\u0199\2\3\3\2\2\2\2\5\3\2"+
+		"+\4,\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\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\6\3"+
+		"\6\3\6\3\6\3\6\3\6\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n"+
+		"\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\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\17\3\20\3\20\3\20\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\21\3\21"+
+		"\3\22\3\22\3\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23"+
+		"\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\25\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\27\3\27\3\27"+
+		"\3\27\3\27\3\27\3\30\3\30\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\32\3\32\3\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\34\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\36\3\36\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."+
+		"\7.\u0155\n.\f.\16.\u0158\13.\3/\3/\7/\u015c\n/\f/\16/\u015f\13/\3\60"+
+		"\3\60\3\60\3\60\3\60\3\60\3\60\3\60\3\60\5\60\u016a\n\60\3\61\6\61\u016d"+
+		"\n\61\r\61\16\61\u016e\3\61\5\61\u0172\n\61\3\61\7\61\u0175\n\61\f\61"+
+		"\16\61\u0178\13\61\3\62\3\62\3\62\3\62\7\62\u017e\n\62\f\62\16\62\u0181"+
+		"\13\62\3\62\3\62\3\63\3\63\3\63\3\63\2\2\64\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\64\3\2\b\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60"+
+		"\62;C\\aac|\3\2\62;\3\2))\5\2\13\f\17\17\"\"\u018f\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"+
@@ -152,96 +150,93 @@ public class EQLLexer extends Lexer {
 		"\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\2"+
 		"Y\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\3k\3\2\2\2\5r\3\2\2\2\7t\3\2\2\2\tv\3\2\2"+
-		"\2\13|\3\2\2\2\r\u0082\3\2\2\2\17\u0084\3\2\2\2\21\u0087\3\2\2\2\23\u008b"+
-		"\3\2\2\2\25\u008f\3\2\2\2\27\u0092\3\2\2\2\31\u009a\3\2\2\2\33\u009d\3"+
-		"\2\2\2\35\u00a2\3\2\2\2\37\u00a9\3\2\2\2!\u00b3\3\2\2\2#\u00bb\3\2\2\2"+
-		"%\u00c1\3\2\2\2\'\u00c9\3\2\2\2)\u00d4\3\2\2\2+\u00dd\3\2\2\2-\u00e2\3"+
-		"\2\2\2/\u00e8\3\2\2\2\61\u00f1\3\2\2\2\63\u00fb\3\2\2\2\65\u0106\3\2\2"+
-		"\2\67\u0112\3\2\2\29\u011b\3\2\2\2;\u0125\3\2\2\2=\u0127\3\2\2\2?\u012a"+
-		"\3\2\2\2A\u012c\3\2\2\2C\u012f\3\2\2\2E\u0132\3\2\2\2G\u0135\3\2\2\2I"+
-		"\u0139\3\2\2\2K\u013b\3\2\2\2M\u013e\3\2\2\2O\u0141\3\2\2\2Q\u0144\3\2"+
-		"\2\2S\u0148\3\2\2\2U\u014b\3\2\2\2W\u014e\3\2\2\2Y\u0151\3\2\2\2[\u0155"+
-		"\3\2\2\2]\u015d\3\2\2\2_\u0164\3\2\2\2a\u0171\3\2\2\2c\u0174\3\2\2\2e"+
-		"\u0181\3\2\2\2g\u018c\3\2\2\2i\u018e\3\2\2\2kl\7u\2\2lm\7g\2\2mn\7n\2"+
-		"\2no\7g\2\2op\7e\2\2pq\7v\2\2q\4\3\2\2\2rs\7*\2\2s\6\3\2\2\2tu\7+\2\2"+
-		"u\b\3\2\2\2vw\7y\2\2wx\7j\2\2xy\7g\2\2yz\7t\2\2z{\7g\2\2{\n\3\2\2\2|}"+
-		"\7h\2\2}~\7g\2\2~\177\7v\2\2\177\u0080\7e\2\2\u0080\u0081\7j\2\2\u0081"+
-		"\f\3\2\2\2\u0082\u0083\7.\2\2\u0083\16\3\2\2\2\u0084\u0085\7q\2\2\u0085"+
-		"\u0086\7t\2\2\u0086\20\3\2\2\2\u0087\u0088\7c\2\2\u0088\u0089\7p\2\2\u0089"+
-		"\u008a\7f\2\2\u008a\22\3\2\2\2\u008b\u008c\7p\2\2\u008c\u008d\7q\2\2\u008d"+
-		"\u008e\7v\2\2\u008e\24\3\2\2\2\u008f\u0090\7k\2\2\u0090\u0091\7p\2\2\u0091"+
-		"\26\3\2\2\2\u0092\u0093\7d\2\2\u0093\u0094\7g\2\2\u0094\u0095\7v\2\2\u0095"+
-		"\u0096\7y\2\2\u0096\u0097\7g\2\2\u0097\u0098\7g\2\2\u0098\u0099\7p\2\2"+
-		"\u0099\30\3\2\2\2\u009a\u009b\7k\2\2\u009b\u009c\7u\2\2\u009c\32\3\2\2"+
-		"\2\u009d\u009e\7p\2\2\u009e\u009f\7w\2\2\u009f\u00a0\7n\2\2\u00a0\u00a1"+
-		"\7n\2\2\u00a1\34\3\2\2\2\u00a2\u00a3\7k\2\2\u00a3\u00a4\7u\2\2\u00a4\u00a5"+
-		"\7P\2\2\u00a5\u00a6\7w\2\2\u00a6\u00a7\7n\2\2\u00a7\u00a8\7n\2\2\u00a8"+
-		"\36\3\2\2\2\u00a9\u00aa\7k\2\2\u00aa\u00ab\7u\2\2\u00ab\u00ac\7P\2\2\u00ac"+
-		"\u00ad\7q\2\2\u00ad\u00ae\7v\2\2\u00ae\u00af\7P\2\2\u00af\u00b0\7w\2\2"+
-		"\u00b0\u00b1\7n\2\2\u00b1\u00b2\7n\2\2\u00b2 \3\2\2\2\u00b3\u00b4\7p\2"+
-		"\2\u00b4\u00b5\7q\2\2\u00b5\u00b6\7v\2\2\u00b6\u00b7\7P\2\2\u00b7\u00b8"+
-		"\7w\2\2\u00b8\u00b9\7n\2\2\u00b9\u00ba\7n\2\2\u00ba\"\3\2\2\2\u00bb\u00bc"+
-		"\7g\2\2\u00bc\u00bd\7o\2\2\u00bd\u00be\7r\2\2\u00be\u00bf\7v\2\2\u00bf"+
-		"\u00c0\7{\2\2\u00c0$\3\2\2\2\u00c1\u00c2\7k\2\2\u00c2\u00c3\7u\2\2\u00c3"+
-		"\u00c4\7G\2\2\u00c4\u00c5\7o\2\2\u00c5\u00c6\7r\2\2\u00c6\u00c7\7v\2\2"+
-		"\u00c7\u00c8\7{\2\2\u00c8&\3\2\2\2\u00c9\u00ca\7k\2\2\u00ca\u00cb\7u\2"+
-		"\2\u00cb\u00cc\7P\2\2\u00cc\u00cd\7q\2\2\u00cd\u00ce\7v\2\2\u00ce\u00cf"+
-		"\7G\2\2\u00cf\u00d0\7o\2\2\u00d0\u00d1\7r\2\2\u00d1\u00d2\7v\2\2\u00d2"+
-		"\u00d3\7{\2\2\u00d3(\3\2\2\2\u00d4\u00d5\7p\2\2\u00d5\u00d6\7q\2\2\u00d6"+
-		"\u00d7\7v\2\2\u00d7\u00d8\7G\2\2\u00d8\u00d9\7o\2\2\u00d9\u00da\7r\2\2"+
-		"\u00da\u00db\7v\2\2\u00db\u00dc\7{\2\2\u00dc*\3\2\2\2\u00dd\u00de\7n\2"+
-		"\2\u00de\u00df\7k\2\2\u00df\u00e0\7m\2\2\u00e0\u00e1\7g\2\2\u00e1,\3\2"+
-		"\2\2\u00e2\u00e3\7k\2\2\u00e3\u00e4\7n\2\2\u00e4\u00e5\7k\2\2\u00e5\u00e6"+
-		"\7m\2\2\u00e6\u00e7\7g\2\2\u00e7.\3\2\2\2\u00e8\u00e9\7e\2\2\u00e9\u00ea"+
-		"\7q\2\2\u00ea\u00eb\7p\2\2\u00eb\u00ec\7v\2\2\u00ec\u00ed\7c\2\2\u00ed"+
-		"\u00ee\7k\2\2\u00ee\u00ef\7p\2\2\u00ef\u00f0\7u\2\2\u00f0\60\3\2\2\2\u00f1"+
-		"\u00f2\7k\2\2\u00f2\u00f3\7e\2\2\u00f3\u00f4\7q\2\2\u00f4\u00f5\7p\2\2"+
-		"\u00f5\u00f6\7v\2\2\u00f6\u00f7\7c\2\2\u00f7\u00f8\7k\2\2\u00f8\u00f9"+
-		"\7p\2\2\u00f9\u00fa\7u\2\2\u00fa\62\3\2\2\2\u00fb\u00fc\7u\2\2\u00fc\u00fd"+
-		"\7v\2\2\u00fd\u00fe\7c\2\2\u00fe\u00ff\7t\2\2\u00ff\u0100\7v\2\2\u0100"+
-		"\u0101\7u\2\2\u0101\u0102\7Y\2\2\u0102\u0103\7k\2\2\u0103\u0104\7v\2\2"+
-		"\u0104\u0105\7j\2\2\u0105\64\3\2\2\2\u0106\u0107\7k\2\2\u0107\u0108\7"+
-		"u\2\2\u0108\u0109\7v\2\2\u0109\u010a\7c\2\2\u010a\u010b\7t\2\2\u010b\u010c"+
-		"\7v\2\2\u010c\u010d\7u\2\2\u010d\u010e\7Y\2\2\u010e\u010f\7k\2\2\u010f"+
-		"\u0110\7v\2\2\u0110\u0111\7j\2\2\u0111\66\3\2\2\2\u0112\u0113\7g\2\2\u0113"+
-		"\u0114\7p\2\2\u0114\u0115\7f\2\2\u0115\u0116\7u\2\2\u0116\u0117\7Y\2\2"+
-		"\u0117\u0118\7k\2\2\u0118\u0119\7v\2\2\u0119\u011a\7j\2\2\u011a8\3\2\2"+
-		"\2\u011b\u011c\7k\2\2\u011c\u011d\7g\2\2\u011d\u011e\7p\2\2\u011e\u011f"+
-		"\7f\2\2\u011f\u0120\7u\2\2\u0120\u0121\7Y\2\2\u0121\u0122\7k\2\2\u0122"+
-		"\u0123\7v\2\2\u0123\u0124\7j\2\2\u0124:\3\2\2\2\u0125\u0126\7?\2\2\u0126"+
-		"<\3\2\2\2\u0127\u0128\7g\2\2\u0128\u0129\7s\2\2\u0129>\3\2\2\2\u012a\u012b"+
-		"\7@\2\2\u012b@\3\2\2\2\u012c\u012d\7i\2\2\u012d\u012e\7v\2\2\u012eB\3"+
-		"\2\2\2\u012f\u0130\7@\2\2\u0130\u0131\7?\2\2\u0131D\3\2\2\2\u0132\u0133"+
-		"\7i\2\2\u0133\u0134\7g\2\2\u0134F\3\2\2\2\u0135\u0136\7i\2\2\u0136\u0137"+
-		"\7v\2\2\u0137\u0138\7g\2\2\u0138H\3\2\2\2\u0139\u013a\7>\2\2\u013aJ\3"+
-		"\2\2\2\u013b\u013c\7n\2\2\u013c\u013d\7v\2\2\u013dL\3\2\2\2\u013e\u013f"+
-		"\7>\2\2\u013f\u0140\7?\2\2\u0140N\3\2\2\2\u0141\u0142\7n\2\2\u0142\u0143"+
-		"\7g\2\2\u0143P\3\2\2\2\u0144\u0145\7n\2\2\u0145\u0146\7v\2\2\u0146\u0147"+
-		"\7g\2\2\u0147R\3\2\2\2\u0148\u0149\7>\2\2\u0149\u014a\7@\2\2\u014aT\3"+
-		"\2\2\2\u014b\u014c\7#\2\2\u014c\u014d\7?\2\2\u014dV\3\2\2\2\u014e\u014f"+
-		"\7p\2\2\u014f\u0150\7g\2\2\u0150X\3\2\2\2\u0151\u0152\7k\2\2\u0152\u0153"+
-		"\7g\2\2\u0153\u0154\7s\2\2\u0154Z\3\2\2\2\u0155\u0156\7<\2\2\u0156\u015a"+
-		"\t\2\2\2\u0157\u0159\t\3\2\2\u0158\u0157\3\2\2\2\u0159\u015c\3\2\2\2\u015a"+
-		"\u0158\3\2\2\2\u015a\u015b\3\2\2\2\u015b\\\3\2\2\2\u015c\u015a\3\2\2\2"+
-		"\u015d\u0161\t\2\2\2\u015e\u0160\t\4\2\2\u015f\u015e\3\2\2\2\u0160\u0163"+
-		"\3\2\2\2\u0161\u015f\3\2\2\2\u0161\u0162\3\2\2\2\u0162^\3\2\2\2\u0163"+
-		"\u0161\3\2\2\2\u0164\u0165\7)\2\2\u0165\u0166\n\5\2\2\u0166\u0167\7)\2"+
-		"\2\u0167`\3\2\2\2\u0168\u0169\7v\2\2\u0169\u016a\7t\2\2\u016a\u016b\7"+
-		"w\2\2\u016b\u0172\7g\2\2\u016c\u016d\7h\2\2\u016d\u016e\7c\2\2\u016e\u016f"+
-		"\7n\2\2\u016f\u0170\7u\2\2\u0170\u0172\7g\2\2\u0171\u0168\3\2\2\2\u0171"+
-		"\u016c\3\2\2\2\u0172b\3\2\2\2\u0173\u0175\t\6\2\2\u0174\u0173\3\2\2\2"+
-		"\u0175\u0176\3\2\2\2\u0176\u0174\3\2\2\2\u0176\u0177\3\2\2\2\u0177\u0179"+
-		"\3\2\2\2\u0178\u017a\7\60\2\2\u0179\u0178\3\2\2\2\u0179\u017a\3\2\2\2"+
-		"\u017a\u017e\3\2\2\2\u017b\u017d\t\6\2\2\u017c\u017b\3\2\2\2\u017d\u0180"+
-		"\3\2\2\2\u017e\u017c\3\2\2\2\u017e\u017f\3\2\2\2\u017fd\3\2\2\2\u0180"+
-		"\u017e\3\2\2\2\u0181\u0187\7)\2\2\u0182\u0186\n\7\2\2\u0183\u0184\7)\2"+
-		"\2\u0184\u0186\7)\2\2\u0185\u0182\3\2\2\2\u0185\u0183\3\2\2\2\u0186\u0189"+
-		"\3\2\2\2\u0187\u0185\3\2\2\2\u0187\u0188\3\2\2\2\u0188\u018a\3\2\2\2\u0189"+
-		"\u0187\3\2\2\2\u018a\u018b\7)\2\2\u018bf\3\2\2\2\u018c\u018d\5_\60\2\u018d"+
-		"h\3\2\2\2\u018e\u018f\t\b\2\2\u018f\u0190\3\2\2\2\u0190\u0191\b\65\2\2"+
-		"\u0191j\3\2\2\2\13\2\u015a\u0161\u0171\u0176\u0179\u017e\u0185\u0187\3"+
-		"\b\2\2";
+		"\2\2\2\3g\3\2\2\2\5n\3\2\2\2\7p\3\2\2\2\tr\3\2\2\2\13x\3\2\2\2\r~\3\2"+
+		"\2\2\17\u0080\3\2\2\2\21\u0083\3\2\2\2\23\u0087\3\2\2\2\25\u008b\3\2\2"+
+		"\2\27\u008e\3\2\2\2\31\u0096\3\2\2\2\33\u0099\3\2\2\2\35\u009e\3\2\2\2"+
+		"\37\u00a5\3\2\2\2!\u00af\3\2\2\2#\u00b7\3\2\2\2%\u00bd\3\2\2\2\'\u00c5"+
+		"\3\2\2\2)\u00d0\3\2\2\2+\u00d9\3\2\2\2-\u00de\3\2\2\2/\u00e4\3\2\2\2\61"+
+		"\u00ed\3\2\2\2\63\u00f7\3\2\2\2\65\u0102\3\2\2\2\67\u010e\3\2\2\29\u0117"+
+		"\3\2\2\2;\u0121\3\2\2\2=\u0123\3\2\2\2?\u0126\3\2\2\2A\u0128\3\2\2\2C"+
+		"\u012b\3\2\2\2E\u012e\3\2\2\2G\u0131\3\2\2\2I\u0135\3\2\2\2K\u0137\3\2"+
+		"\2\2M\u013a\3\2\2\2O\u013d\3\2\2\2Q\u0140\3\2\2\2S\u0144\3\2\2\2U\u0147"+
+		"\3\2\2\2W\u014a\3\2\2\2Y\u014d\3\2\2\2[\u0151\3\2\2\2]\u0159\3\2\2\2_"+
+		"\u0169\3\2\2\2a\u016c\3\2\2\2c\u0179\3\2\2\2e\u0184\3\2\2\2gh\7u\2\2h"+
+		"i\7g\2\2ij\7n\2\2jk\7g\2\2kl\7e\2\2lm\7v\2\2m\4\3\2\2\2no\7*\2\2o\6\3"+
+		"\2\2\2pq\7+\2\2q\b\3\2\2\2rs\7y\2\2st\7j\2\2tu\7g\2\2uv\7t\2\2vw\7g\2"+
+		"\2w\n\3\2\2\2xy\7h\2\2yz\7g\2\2z{\7v\2\2{|\7e\2\2|}\7j\2\2}\f\3\2\2\2"+
+		"~\177\7.\2\2\177\16\3\2\2\2\u0080\u0081\7q\2\2\u0081\u0082\7t\2\2\u0082"+
+		"\20\3\2\2\2\u0083\u0084\7c\2\2\u0084\u0085\7p\2\2\u0085\u0086\7f\2\2\u0086"+
+		"\22\3\2\2\2\u0087\u0088\7p\2\2\u0088\u0089\7q\2\2\u0089\u008a\7v\2\2\u008a"+
+		"\24\3\2\2\2\u008b\u008c\7k\2\2\u008c\u008d\7p\2\2\u008d\26\3\2\2\2\u008e"+
+		"\u008f\7d\2\2\u008f\u0090\7g\2\2\u0090\u0091\7v\2\2\u0091\u0092\7y\2\2"+
+		"\u0092\u0093\7g\2\2\u0093\u0094\7g\2\2\u0094\u0095\7p\2\2\u0095\30\3\2"+
+		"\2\2\u0096\u0097\7k\2\2\u0097\u0098\7u\2\2\u0098\32\3\2\2\2\u0099\u009a"+
+		"\7p\2\2\u009a\u009b\7w\2\2\u009b\u009c\7n\2\2\u009c\u009d\7n\2\2\u009d"+
+		"\34\3\2\2\2\u009e\u009f\7k\2\2\u009f\u00a0\7u\2\2\u00a0\u00a1\7P\2\2\u00a1"+
+		"\u00a2\7w\2\2\u00a2\u00a3\7n\2\2\u00a3\u00a4\7n\2\2\u00a4\36\3\2\2\2\u00a5"+
+		"\u00a6\7k\2\2\u00a6\u00a7\7u\2\2\u00a7\u00a8\7P\2\2\u00a8\u00a9\7q\2\2"+
+		"\u00a9\u00aa\7v\2\2\u00aa\u00ab\7P\2\2\u00ab\u00ac\7w\2\2\u00ac\u00ad"+
+		"\7n\2\2\u00ad\u00ae\7n\2\2\u00ae \3\2\2\2\u00af\u00b0\7p\2\2\u00b0\u00b1"+
+		"\7q\2\2\u00b1\u00b2\7v\2\2\u00b2\u00b3\7P\2\2\u00b3\u00b4\7w\2\2\u00b4"+
+		"\u00b5\7n\2\2\u00b5\u00b6\7n\2\2\u00b6\"\3\2\2\2\u00b7\u00b8\7g\2\2\u00b8"+
+		"\u00b9\7o\2\2\u00b9\u00ba\7r\2\2\u00ba\u00bb\7v\2\2\u00bb\u00bc\7{\2\2"+
+		"\u00bc$\3\2\2\2\u00bd\u00be\7k\2\2\u00be\u00bf\7u\2\2\u00bf\u00c0\7G\2"+
+		"\2\u00c0\u00c1\7o\2\2\u00c1\u00c2\7r\2\2\u00c2\u00c3\7v\2\2\u00c3\u00c4"+
+		"\7{\2\2\u00c4&\3\2\2\2\u00c5\u00c6\7k\2\2\u00c6\u00c7\7u\2\2\u00c7\u00c8"+
+		"\7P\2\2\u00c8\u00c9\7q\2\2\u00c9\u00ca\7v\2\2\u00ca\u00cb\7G\2\2\u00cb"+
+		"\u00cc\7o\2\2\u00cc\u00cd\7r\2\2\u00cd\u00ce\7v\2\2\u00ce\u00cf\7{\2\2"+
+		"\u00cf(\3\2\2\2\u00d0\u00d1\7p\2\2\u00d1\u00d2\7q\2\2\u00d2\u00d3\7v\2"+
+		"\2\u00d3\u00d4\7G\2\2\u00d4\u00d5\7o\2\2\u00d5\u00d6\7r\2\2\u00d6\u00d7"+
+		"\7v\2\2\u00d7\u00d8\7{\2\2\u00d8*\3\2\2\2\u00d9\u00da\7n\2\2\u00da\u00db"+
+		"\7k\2\2\u00db\u00dc\7m\2\2\u00dc\u00dd\7g\2\2\u00dd,\3\2\2\2\u00de\u00df"+
+		"\7k\2\2\u00df\u00e0\7n\2\2\u00e0\u00e1\7k\2\2\u00e1\u00e2\7m\2\2\u00e2"+
+		"\u00e3\7g\2\2\u00e3.\3\2\2\2\u00e4\u00e5\7e\2\2\u00e5\u00e6\7q\2\2\u00e6"+
+		"\u00e7\7p\2\2\u00e7\u00e8\7v\2\2\u00e8\u00e9\7c\2\2\u00e9\u00ea\7k\2\2"+
+		"\u00ea\u00eb\7p\2\2\u00eb\u00ec\7u\2\2\u00ec\60\3\2\2\2\u00ed\u00ee\7"+
+		"k\2\2\u00ee\u00ef\7e\2\2\u00ef\u00f0\7q\2\2\u00f0\u00f1\7p\2\2\u00f1\u00f2"+
+		"\7v\2\2\u00f2\u00f3\7c\2\2\u00f3\u00f4\7k\2\2\u00f4\u00f5\7p\2\2\u00f5"+
+		"\u00f6\7u\2\2\u00f6\62\3\2\2\2\u00f7\u00f8\7u\2\2\u00f8\u00f9\7v\2\2\u00f9"+
+		"\u00fa\7c\2\2\u00fa\u00fb\7t\2\2\u00fb\u00fc\7v\2\2\u00fc\u00fd\7u\2\2"+
+		"\u00fd\u00fe\7Y\2\2\u00fe\u00ff\7k\2\2\u00ff\u0100\7v\2\2\u0100\u0101"+
+		"\7j\2\2\u0101\64\3\2\2\2\u0102\u0103\7k\2\2\u0103\u0104\7u\2\2\u0104\u0105"+
+		"\7v\2\2\u0105\u0106\7c\2\2\u0106\u0107\7t\2\2\u0107\u0108\7v\2\2\u0108"+
+		"\u0109\7u\2\2\u0109\u010a\7Y\2\2\u010a\u010b\7k\2\2\u010b\u010c\7v\2\2"+
+		"\u010c\u010d\7j\2\2\u010d\66\3\2\2\2\u010e\u010f\7g\2\2\u010f\u0110\7"+
+		"p\2\2\u0110\u0111\7f\2\2\u0111\u0112\7u\2\2\u0112\u0113\7Y\2\2\u0113\u0114"+
+		"\7k\2\2\u0114\u0115\7v\2\2\u0115\u0116\7j\2\2\u01168\3\2\2\2\u0117\u0118"+
+		"\7k\2\2\u0118\u0119\7g\2\2\u0119\u011a\7p\2\2\u011a\u011b\7f\2\2\u011b"+
+		"\u011c\7u\2\2\u011c\u011d\7Y\2\2\u011d\u011e\7k\2\2\u011e\u011f\7v\2\2"+
+		"\u011f\u0120\7j\2\2\u0120:\3\2\2\2\u0121\u0122\7?\2\2\u0122<\3\2\2\2\u0123"+
+		"\u0124\7g\2\2\u0124\u0125\7s\2\2\u0125>\3\2\2\2\u0126\u0127\7@\2\2\u0127"+
+		"@\3\2\2\2\u0128\u0129\7i\2\2\u0129\u012a\7v\2\2\u012aB\3\2\2\2\u012b\u012c"+
+		"\7@\2\2\u012c\u012d\7?\2\2\u012dD\3\2\2\2\u012e\u012f\7i\2\2\u012f\u0130"+
+		"\7g\2\2\u0130F\3\2\2\2\u0131\u0132\7i\2\2\u0132\u0133\7v\2\2\u0133\u0134"+
+		"\7g\2\2\u0134H\3\2\2\2\u0135\u0136\7>\2\2\u0136J\3\2\2\2\u0137\u0138\7"+
+		"n\2\2\u0138\u0139\7v\2\2\u0139L\3\2\2\2\u013a\u013b\7>\2\2\u013b\u013c"+
+		"\7?\2\2\u013cN\3\2\2\2\u013d\u013e\7n\2\2\u013e\u013f\7g\2\2\u013fP\3"+
+		"\2\2\2\u0140\u0141\7n\2\2\u0141\u0142\7v\2\2\u0142\u0143\7g\2\2\u0143"+
+		"R\3\2\2\2\u0144\u0145\7>\2\2\u0145\u0146\7@\2\2\u0146T\3\2\2\2\u0147\u0148"+
+		"\7#\2\2\u0148\u0149\7?\2\2\u0149V\3\2\2\2\u014a\u014b\7p\2\2\u014b\u014c"+
+		"\7g\2\2\u014cX\3\2\2\2\u014d\u014e\7k\2\2\u014e\u014f\7g\2\2\u014f\u0150"+
+		"\7s\2\2\u0150Z\3\2\2\2\u0151\u0152\7<\2\2\u0152\u0156\t\2\2\2\u0153\u0155"+
+		"\t\3\2\2\u0154\u0153\3\2\2\2\u0155\u0158\3\2\2\2\u0156\u0154\3\2\2\2\u0156"+
+		"\u0157\3\2\2\2\u0157\\\3\2\2\2\u0158\u0156\3\2\2\2\u0159\u015d\t\2\2\2"+
+		"\u015a\u015c\t\4\2\2\u015b\u015a\3\2\2\2\u015c\u015f\3\2\2\2\u015d\u015b"+
+		"\3\2\2\2\u015d\u015e\3\2\2\2\u015e^\3\2\2\2\u015f\u015d\3\2\2\2\u0160"+
+		"\u0161\7v\2\2\u0161\u0162\7t\2\2\u0162\u0163\7w\2\2\u0163\u016a\7g\2\2"+
+		"\u0164\u0165\7h\2\2\u0165\u0166\7c\2\2\u0166\u0167\7n\2\2\u0167\u0168"+
+		"\7u\2\2\u0168\u016a\7g\2\2\u0169\u0160\3\2\2\2\u0169\u0164\3\2\2\2\u016a"+
+		"`\3\2\2\2\u016b\u016d\t\5\2\2\u016c\u016b\3\2\2\2\u016d\u016e\3\2\2\2"+
+		"\u016e\u016c\3\2\2\2\u016e\u016f\3\2\2\2\u016f\u0171\3\2\2\2\u0170\u0172"+
+		"\7\60\2\2\u0171\u0170\3\2\2\2\u0171\u0172\3\2\2\2\u0172\u0176\3\2\2\2"+
+		"\u0173\u0175\t\5\2\2\u0174\u0173\3\2\2\2\u0175\u0178\3\2\2\2\u0176\u0174"+
+		"\3\2\2\2\u0176\u0177\3\2\2\2\u0177b\3\2\2\2\u0178\u0176\3\2\2\2\u0179"+
+		"\u017f\7)\2\2\u017a\u017e\n\6\2\2\u017b\u017c\7)\2\2\u017c\u017e\7)\2"+
+		"\2\u017d\u017a\3\2\2\2\u017d\u017b\3\2\2\2\u017e\u0181\3\2\2\2\u017f\u017d"+
+		"\3\2\2\2\u017f\u0180\3\2\2\2\u0180\u0182\3\2\2\2\u0181\u017f\3\2\2\2\u0182"+
+		"\u0183\7)\2\2\u0183d\3\2\2\2\u0184\u0185\t\7\2\2\u0185\u0186\3\2\2\2\u0186"+
+		"\u0187\b\63\2\2\u0187f\3\2\2\2\13\2\u0156\u015d\u0169\u016e\u0171\u0176"+
+		"\u017d\u017f\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
index 29cd61604..174ef1964 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
@@ -44,12 +44,10 @@ T__42=43
 T__43=44
 INPUT_VARIABLE=45
 PATH_VARIABLE=46
-CHARACTER=47
-BOOLEAN_LITERAL=48
-NUMBER_LITERAL=49
-STRING_LITERAL=50
-ESCAPE_CHARACTER=51
-WS=52
+BOOLEAN_LITERAL=47
+NUMBER_LITERAL=48
+STRING_LITERAL=49
+WS=50
 'select'=1
 '('=2
 ')'=3
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLListener.java
index e578fc3c4..44e90d625 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.1
+// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.3
 package com.avaje.ebeaninternal.server.grammer.antlr;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLParser.java
index 5fb73d454..b68dd3905 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.1
+// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.3
 package com.avaje.ebeaninternal.server.grammer.antlr;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class EQLParser extends Parser {
-	static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
+	static { RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION); }
 
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =
@@ -23,8 +23,8 @@ public class EQLParser extends Parser {
 		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31, 
 		T__31=32, T__32=33, T__33=34, T__34=35, T__35=36, T__36=37, T__37=38, 
 		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, INPUT_VARIABLE=45, 
-		PATH_VARIABLE=46, CHARACTER=47, BOOLEAN_LITERAL=48, NUMBER_LITERAL=49, 
-		STRING_LITERAL=50, ESCAPE_CHARACTER=51, WS=52;
+		PATH_VARIABLE=46, BOOLEAN_LITERAL=47, NUMBER_LITERAL=48, STRING_LITERAL=49, 
+		WS=50;
 	public static final int
 		RULE_select_statement = 0, RULE_select_clause = 1, RULE_fetch_clause = 2, 
 		RULE_where_clause = 3, RULE_fetch_path = 4, RULE_fetch_property_group = 5, 
@@ -59,8 +59,8 @@ 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, "INPUT_VARIABLE", 
-		"PATH_VARIABLE", "CHARACTER", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "STRING_LITERAL", 
-		"ESCAPE_CHARACTER", "WS"
+		"PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "STRING_LITERAL", 
+		"WS"
 	};
 	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
@@ -648,6 +648,7 @@ public class EQLParser extends Parser {
 		enterRule(_localctx, 20, RULE_conditional_primary);
 		try {
 			setState(113);
+			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,7,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
@@ -730,6 +731,7 @@ public class EQLParser extends Parser {
 		enterRule(_localctx, 22, RULE_any_expression);
 		try {
 			setState(128);
+			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,8,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
@@ -890,6 +892,7 @@ public class EQLParser extends Parser {
 		int _la;
 		try {
 			setState(149);
+			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,10,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
@@ -1072,6 +1075,7 @@ public class EQLParser extends Parser {
 		enterRule(_localctx, 32, RULE_isNull_expression);
 		try {
 			setState(168);
+			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
@@ -1127,6 +1131,7 @@ public class EQLParser extends Parser {
 		enterRule(_localctx, 34, RULE_isNotNull_expression);
 		try {
 			setState(178);
+			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,12,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
@@ -1193,6 +1198,7 @@ public class EQLParser extends Parser {
 		enterRule(_localctx, 36, RULE_isEmpty_expression);
 		try {
 			setState(185);
+			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
@@ -1248,6 +1254,7 @@ public class EQLParser extends Parser {
 		enterRule(_localctx, 38, RULE_isNotEmpty_expression);
 		try {
 			setState(195);
+			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
@@ -1573,7 +1580,7 @@ public class EQLParser extends Parser {
 	}
 
 	public static final String _serializedATN =
-		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\66\u00da\4\2\t\2"+
+		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\64\u00da\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"+
@@ -1590,7 +1597,7 @@ public class EQLParser extends Parser {
 		"\25\3\25\3\25\3\25\3\25\3\25\5\25\u00c6\n\25\3\26\3\26\3\26\3\26\3\27"+
 		"\3\27\3\30\3\30\3\30\3\30\3\31\3\31\3\32\3\32\5\32\u00d6\n\32\3\33\3\33"+
 		"\3\33\2\2\34\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64"+
-		"\2\5\3\2\27\36\3\2\37.\3\2\62\64\u00da\2\67\3\2\2\2\4?\3\2\2\2\6D\3\2"+
+		"\2\5\3\2\27\36\3\2\37.\3\2\61\63\u00da\2\67\3\2\2\2\4?\3\2\2\2\6D\3\2"+
 		"\2\2\bF\3\2\2\2\nI\3\2\2\2\fO\3\2\2\2\16W\3\2\2\2\20Y\3\2\2\2\22a\3\2"+
 		"\2\2\24j\3\2\2\2\26s\3\2\2\2\30\u0082\3\2\2\2\32\u0084\3\2\2\2\34\u0097"+
 		"\3\2\2\2\36\u0099\3\2\2\2 \u009f\3\2\2\2\"\u00aa\3\2\2\2$\u00b4\3\2\2"+
diff --git a/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java
index 85d0dcc62..e74212a4a 100644
--- a/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java
@@ -124,6 +124,15 @@ public class EqlParserTest {
     assertThat(query.getGeneratedSql()).contains("where t0.name in (?, ?, ? )");
   }
 
+  @Test
+  public void where_between() throws Exception {
+
+    Query<Customer> query = parse("where name between 'As' and 'B'");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where t0.name between  ? and ? ");
+  }
+
   private Query<Customer> parse(String raw) {
 
     Query<Customer> query = Ebean.find(Customer.class);
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index 7a34bbc13..4085f17bc 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -144,10 +144,6 @@ PATH_VARIABLE
    : ('a' .. 'z' | 'A' .. 'Z' | '_') ('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '.')*
    ;
 
-CHARACTER
-   : '\'' (~ ('\'' | '\\')) '\''
-   ;
-
 BOOLEAN_LITERAL
    : 'true'
    | 'false'
@@ -160,10 +156,6 @@ STRING_LITERAL
    : '\'' ( ~'\'' | '\'\'' )* '\''
    ;
 
-ESCAPE_CHARACTER
-   : CHARACTER
-   ;
-
 WS
    : [ \t\r\n] -> skip
    ;