diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index ed35ed7563..4eeed31f2b 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -11,11 +11,11 @@ version.label=r2
 
 # Edition label
 
-version.edition=Community
+version.edition=Enterprise
 
 # Build number
 
-version.build=@build-number@
+version.build=r16812
 
 # Schema number
 
diff --git a/source/java/org/alfresco/cmis/search/CMISQueryParser.java b/source/java/org/alfresco/cmis/search/CMISQueryParser.java
index 389a328c13..fe61bb12f0 100644
--- a/source/java/org/alfresco/cmis/search/CMISQueryParser.java
+++ b/source/java/org/alfresco/cmis/search/CMISQueryParser.java
@@ -79,11 +79,9 @@ import org.alfresco.repo.search.impl.querymodel.impl.functions.In;
 import org.alfresco.repo.search.impl.querymodel.impl.functions.LessThan;
 import org.alfresco.repo.search.impl.querymodel.impl.functions.LessThanOrEquals;
 import org.alfresco.repo.search.impl.querymodel.impl.functions.Like;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Lower;
 import org.alfresco.repo.search.impl.querymodel.impl.functions.NotEquals;
 import org.alfresco.repo.search.impl.querymodel.impl.functions.PropertyAccessor;
 import org.alfresco.repo.search.impl.querymodel.impl.functions.Score;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Upper;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
@@ -732,7 +730,20 @@ public class CMISQueryParser
                         int start = getStringPosition(query, functionNode.getLine(), functionNode.getCharPositionInLine());
                         int end = getStringPosition(query, rparenNode.getLine(), rparenNode.getCharPositionInLine());
 
-                        String alias = query.substring(start, end + 1);
+                        String alias;
+                        if(function.getName().equals(Score.NAME))
+                        {
+                            alias = "SEARCH_SCORE";
+                            // check no args
+                            if (functionNode.getChildCount() > 3)
+                            {
+                                throw new CMISQueryException("The function SCORE() is not allowed any arguments");
+                            }
+                        }
+                        else
+                        {
+                            alias = query.substring(start, end + 1);
+                        }
                         if (columnNode.getChildCount() > 1)
                         {
                             alias = columnNode.getChild(1).getText();
diff --git a/source/java/org/alfresco/cmis/search/QueryTest.java b/source/java/org/alfresco/cmis/search/QueryTest.java
index f40031985d..ee03fd0e4e 100644
--- a/source/java/org/alfresco/cmis/search/QueryTest.java
+++ b/source/java/org/alfresco/cmis/search/QueryTest.java
@@ -1279,7 +1279,7 @@ public class QueryTest extends BaseCMISTest
         testQuery("SELECT cmis:objectTypeId FROM cmis:folder WHERE cmis:objectTypeId >  'cmis:folder'", 0, false, "cmis:objectId", new String(), true);
         testQuery("SELECT cmis:objectTypeId FROM cmis:folder WHERE cmis:objectTypeId >= 'cmis:folder'", 0, false, "cmis:objectId", new String(), true);
 
-        testQuery("SELECT cmis:objectTypeId FROM cmis:folder WHEcmis:folderectTypeId IN     ('cmis:folder')", 10, false, "cmis:objectId", new String(), false);
+        testQuery("SELECT cmis:objectTypeId FROM cmis:folder WHERE cmis:objectTypeId IN     ('cmis:folder')", 10, false, "cmis:objectId", new String(), false);
         testQuery("SELECT cmis:objectTypeId FROM cmis:folder WHERE cmis:objectTypeId NOT IN ('cmis:folder')", 0, false, "cmis:objectId", new String(), false);
 
         testQuery("SELECT cmis:objectTypeId FROM cmis:folder WHERE cmis:objectTypeId     LIKE 'cmis:folder'", 10, false, "cmis:objectId", new String(), false);
@@ -1345,7 +1345,7 @@ public class QueryTest extends BaseCMISTest
 
     public void testOrderBy()
     {
-        String query = "SELECT  cmis:objectId FROM cmis:document ORDER cmis:objectId";
+        String query = "SELECT  cmis:objectId FROM cmis:document ORDER BY cmis:objectId";
         CMISResultSet rs = cmisQueryService.query(query);
         // assertEquals(1, rs.getLength());
         for (CMISResultSetRow row : rs)
@@ -1355,7 +1355,7 @@ public class QueryTest extends BaseCMISTest
         rs.close();
         rs = null;
 
-        query = "SELECT  cmis:objectId FROM cmis:document ORDER cmis:objectId ASC";
+        query = "SELECT  cmis:objectId FROM cmis:document ORDER BY cmis:objectId ASC";
         rs = cmisQueryService.query(query);
         // assertEquals(1, rs.getLength());
         for (CMISResultSetRow row : rs)
@@ -1365,7 +1365,7 @@ public class QueryTest extends BaseCMISTest
         rs.close();
         rs = null;
 
-        query = "SELECT  cmis:objectId FROM cmis:document ORDER cmis:objectId DESC";
+        query = "SELECT  cmis:objectId FROM cmis:document ORDER BY cmis:objectId DESC";
         rs = cmisQueryService.query(query);
         // assertEquals(1, rs.getLength());
         for (CMISResultSetRow row : rs)
@@ -1635,22 +1635,21 @@ public class QueryTest extends BaseCMISTest
     public void testFunctionColumns()
     {
         CMISQueryOptions options = new CMISQueryOptions(
-                "SELECT DOC.cmis:name AS cmis:name, \nLOWER(\tDOC.cmis:name \n), LOWER ( DOC.cmis:name )  AS Lcmis:name, UPPER ( DOC.cmis:name ) , UPPER(DOC.cmis:name) AS Ucmis:name, Score(), SCORE(DOC), SCORE() AS SCORED, SCORE(DOC) AS DOCSCORE FROM cmis:folder AS DOC",
+                "SELECT DOC.cmis:name AS cmis:name, \nLOWER(\tDOC.cmis:name \n), LOWER ( DOC.cmis:name )  AS Lcmis:name, UPPER ( DOC.cmis:name ) , UPPER(DOC.cmis:name) AS Ucmis:name, Score(), SCORE() AS S1, SCORE() AS SCORED FROM cmis:folder AS DOC",
                 rootNodeRef.getStoreRef());
         CMISResultSet rs = cmisQueryService.query(options);
 
         CMISResultSetMetaData md = rs.getMetaData();
         assertNotNull(md.getQueryOptions());
-        assertEquals(9, md.getColumnNames().length);
+        assertEquals(8, md.getColumnNames().length);
         assertNotNull(md.getColumn("cmis:name"));
         assertNotNull(md.getColumn("LOWER(\tDOC.cmis:name \n)"));
         assertNotNull(md.getColumn("Lcmis:name"));
         assertNotNull(md.getColumn("UPPER ( DOC.cmis:name )"));
         assertNotNull(md.getColumn("Ucmis:name"));
-        assertNotNull(md.getColumn("Score()"));
-        assertNotNull(md.getColumn("SCORE(DOC)"));
+        assertNotNull(md.getColumn("SEARCH_SCORE"));
+        assertNotNull(md.getColumn("S1"));
         assertNotNull(md.getColumn("SCORED"));
-        assertNotNull(md.getColumn("DOCSCORE"));
         assertEquals(1, md.getSelectors().length);
         assertNotNull(md.getSelector("DOC"));
         for (CMISResultSetRow row : rs)
@@ -1664,7 +1663,7 @@ public class QueryTest extends BaseCMISTest
 
     public void testParse1() throws RecognitionException
     {
-        String query = "SELECT UPPER(1.0) AS WOOF FROM cmis:document AS DOC LEFT OUTER JOIN cmis:folder AS FOLDER ON (DOC.cmis:name = FOLDER.cmis:name) WHERE LOWER(DOC.cmis:name = ' woof' AND CONTAINS(, 'one two three') AND  CONTAINS(, 'DOC.cmis:name:lemur AND woof') AND (DOC.cmis:name in ('one', 'two') AND IN_FOLDER('meep') AND DOC.cmis:name like 'woof' and DOC.cmis:name = 'woof' and DOC.cmis:objectId = 'meep') ORDER BY DOC.cmis:name DESC, WOOF";
+        String query = "SELECT UPPER(1.0) AS WOOF FROM cmis:document AS DOC LEFT OUTER JOIN cmis:folder AS FOLDER ON DOC.cmis:name = FOLDER.cmis:name WHERE LOWER(DOC.cmis:name) = ' woof' AND CONTAINS('one two three') AND  CONTAINS('DOC.cmis:name:lemur AND woof') AND (DOC.cmis:name in ('one', 'two') AND IN_FOLDER('meep') AND DOC.cmis:name like 'woof' and DOC.cmis:name = 'woof' and DOC.cmis:objectId = 'meep') ORDER BY DOC.cmis:name DESC, WOOF";
         parse(query);
     }
 
@@ -1688,7 +1687,7 @@ public class QueryTest extends BaseCMISTest
 
     public void testParse5() throws RecognitionException
     {
-        String query = "SELECT Y.CLAIM_NUM, X.PROPERTY_ADDRESS, Y.DAMAGE_ESTIMATES FROM POLICY AS X JOIN CLAIMS AS Y ON ( X.POLICY_NUM = Y.POLICY_NUM ) WHERE ( 100000 <= ANY Y.DAMAGE_ESTIMATES ) AND ( Y.CAUSE NOT LIKE '%Katrina%' )";
+        String query = "SELECT Y.CLAIM_NUM, X.PROPERTY_ADDRESS, Y.DAMAGE_ESTIMATES FROM POLICY AS X JOIN CLAIMS AS Y ON X.POLICY_NUM = Y.POLICY_NUM WHERE ( 100000 <= ANY Y.DAMAGE_ESTIMATES ) AND ( Y.CAUSE NOT LIKE '%Katrina%' )";
         parse(query);
     }
 
@@ -1696,19 +1695,17 @@ public class QueryTest extends BaseCMISTest
     {
         String query = "SELECT * FROM CM_TITLED";
         parse(query);
-        query = "SELECT D.*, T.* FROM DOCUMENT AS D JOIN CM_TITLED AS T ON (D.OBJECTID = T.OBJECTID)";
+        query = "SELECT D.*, T.* FROM DOCUMENT AS D JOIN CM_TITLED AS T ON D.OBJECTID = T.OBJECTID";
         parse(query);
-        query = "SELECT D.*, T.* FROM CM_TITLED T JOIN DOCUMENT D ON (D.OBJECTID = T.OBJECTID)";
+        query = "SELECT D.*, T.* FROM CM_TITLED T JOIN DOCUMENT D ON D.OBJECTID = T.OBJECTID";
         parse(query);
     }
     
-    public void testParseIssues() throws RecognitionException
+    public void testParse7() throws RecognitionException
     {
-        String query = "SELECT cmis:name, cmis:objectId, asdf asdfasdf asdfasdf asdfasdfasdf FROM DOCUMENT";
+        String query = "SELECT * from DOCUMENT D JOIN DOCUMENT DD ON D.ID = DD.ID ";
         parse(query);
-    }
-
-    
+    }   
     
     public void testAspectProperties()
     {
@@ -1735,7 +1732,7 @@ public class QueryTest extends BaseCMISTest
     public void testAspectJoin()
     {
         testQuery(
-                "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN CMIS:DOCUMENT AS D ON D.cmis:objectId = o.cmis:objectId  ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, '\"jumped\"') and 2 <> D.cmis:contentStreamLength",
+                "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN CMIS:DOCUMENT AS D ON D.cmis:objectId = o.cmis:objectId  ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, '\"jumped\"') and D.cmis:contentStreamLength <> 2",
                 1, false, "cmis:objectId", new String(), false, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS);
         
         testQuery("SELECT * FROM CM:OWNABLE", 1, false, "cmis:objectId", new String(), false, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS);
@@ -1762,10 +1759,10 @@ public class QueryTest extends BaseCMISTest
         testQuery("select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId  JOIN CMIS:DOCUMENT AS D ON D.cmis:objectId = o.cmis:objectId  )", 1, false, "cmis:objectId",
                 new String(), false, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS);
         testQuery(
-                "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN CMIS:DOCUMENT AS D ON D.cmis:objectId = o.cmis:objectId ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, '\"jumped\"') and 2 <> D.cmis:contentStreamLength",
+                "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN CMIS:DOCUMENT AS D ON D.cmis:objectId = o.cmis:objectId ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, '\"jumped\"') and D.cmis:contentStreamLength <> 2",
                 1, false, "cmis:objectId", new String(), false, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS);
         testQuery(
-                "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN CMIS:DOCUMENT AS D ON D.cmis:objectId = o.cmis:objectId ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, 'jumped') and 2 <> D.cmis:contentStreamLength",
+                "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN CMIS:DOCUMENT AS D ON D.cmis:objectId = o.cmis:objectId ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, 'jumped') and D.cmis:contentStreamLength <> 2",
                 1, false, "cmis:objectId", new String(), false, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS);
     }
 
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g
index 4db3e710e2..08953eaed3 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g
@@ -70,9 +70,18 @@ tokens
 	BOOLEAN_LITERAL;
 }
 
-@lexer::header{package org.alfresco.repo.search.impl.parsers;} 
+@lexer::header
+{
+    package org.alfresco.repo.search.impl.parsers;
+    import org.alfresco.cmis.CMISQueryException;
+} 
+
+@header
+{
+    package org.alfresco.repo.search.impl.parsers;
+    import org.alfresco.cmis.CMISQueryException;
+}
 
-@header {package org.alfresco.repo.search.impl.parsers;}
 
 /*
  * Instance methods and properties for the parser.
@@ -83,68 +92,197 @@ tokens
 {
     private Stack<String> paraphrases = new Stack<String>();
     
-    private boolean strict = true;
+    private boolean strict = false;
 
     /**
      * CMIS strict
      */
-	public boolean strict()
-	{
-	   return strict;
-	}
+    public boolean strict()
+    {
+        return strict;
+    }
 	
-	public void setStrict(boolean strict)
-  {
-     this.strict = strict;
-  }
+    public void setStrict(boolean strict)
+    {
+        this.strict = strict;
+    }
+        
+    protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException
+    {
+        throw new MismatchedTokenException(ttype, input);
+    }
 	
-	protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException
-	{
-	   throw new MismatchedTokenException(ttype, input);
-	}
+    public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
+    {
+        throw e;
+    }
 	
-	public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
-	{
-	   throw e;
-	}
+    public String getErrorMessage(RecognitionException e, String[] tokenNames) 
+    {
+        List stack = getRuleInvocationStack(e, this.getClass().getName());
+        String msg = e.getMessage();
+        if ( e instanceof UnwantedTokenException ) 
+	    {
+            UnwantedTokenException ute = (UnwantedTokenException)e;
+            String tokenName="<unknown>";
+            if ( ute.expecting== Token.EOF ) 
+            {
+                tokenName = "EOF";
+            }
+            else 
+            {
+                tokenName = tokenNames[ute.expecting];
+            }
+            msg = "extraneous input " + getTokenErrorDisplay(ute.getUnexpectedToken())
+                + " expecting "+tokenName;
+        }
+        else if ( e instanceof MissingTokenException ) 
+        {
+            MissingTokenException mte = (MissingTokenException)e;
+            String tokenName="<unknown>";
+            if ( mte.expecting== Token.EOF ) 
+            {
+                tokenName = "EOF";
+            }
+            else 
+            {
+                tokenName = tokenNames[mte.expecting];
+            }
+            msg = "missing " + tokenName+" at " + getTokenErrorDisplay(e.token)
+                + "  (" + getLongTokenErrorDisplay(e.token) +")";
+        }
+        else if ( e instanceof MismatchedTokenException ) 
+        {
+            MismatchedTokenException mte = (MismatchedTokenException)e;
+            String tokenName="<unknown>";
+            if ( mte.expecting== Token.EOF ) 
+            {
+                tokenName = "EOF";
+            }
+            else
+            {
+                tokenName = tokenNames[mte.expecting];
+            }
+            msg = "mismatched input " + getTokenErrorDisplay(e.token)
+                + " expecting " + tokenName +"  (" + getLongTokenErrorDisplay(e.token) + ")";
+        }
+        else if ( e instanceof MismatchedTreeNodeException ) 
+        {
+            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
+            String tokenName="<unknown>";
+            if ( mtne.expecting==Token.EOF )  
+            {
+                tokenName = "EOF";
+            }
+            else 
+            {
+                tokenName = tokenNames[mtne.expecting];
+            }
+            msg = "mismatched tree node: " + mtne.node + " expecting " + tokenName;
+        }
+        else if ( e instanceof NoViableAltException ) 
+        {
+            NoViableAltException nvae = (NoViableAltException)e;
+            msg = "no viable alternative at input " + getTokenErrorDisplay(e.token)
+                + "\n\t (decision=" + nvae.decisionNumber
+                + " state " + nvae.stateNumber + ")" 
+                + " decision=<<" + nvae.grammarDecisionDescription + ">>";
+        }
+        else if ( e instanceof EarlyExitException ) 
+        {
+            //EarlyExitException eee = (EarlyExitException)e;
+            // for development, can add "(decision="+eee.decisionNumber+")"
+            msg = "required (...)+ loop did not match anything at input " + getTokenErrorDisplay(e.token);
+        }
+	    else if ( e instanceof MismatchedSetException ) 
+	    {
+	        MismatchedSetException mse = (MismatchedSetException)e;
+	        msg = "mismatched input " + getTokenErrorDisplay(e.token)
+                + " expecting set " + mse.expecting;
+        }
+        else if ( e instanceof MismatchedNotSetException ) 
+        {
+            MismatchedNotSetException mse = (MismatchedNotSetException)e;
+            msg = "mismatched input " + getTokenErrorDisplay(e.token)
+                + " expecting set " + mse.expecting;
+        }
+        else if ( e instanceof FailedPredicateException ) 
+        {
+            FailedPredicateException fpe = (FailedPredicateException)e;
+            msg = "rule " + fpe.ruleName + " failed predicate: {" + fpe.predicateText + "}?";
+        }
+		
+        if(paraphrases.size() > 0)
+        {
+            String paraphrase = (String)paraphrases.peek();
+            msg = msg+" "+paraphrase;
+        }
+        return msg +"\n\t"+stack;
+    }
 	
-	public String getErrorMessage(RecognitionException e, String[] tokenNames)
-	{
-       List stack = getRuleInvocationStack(e, this.getClass().getName());
-	   String msg = null;
-	   if(e instanceof NoViableAltException)
-	   {
-	        NoViableAltException nvae = (NoViableAltException)e;
-	        msg = "No viable alt; token="+e.token+
-	         " (decision="+nvae.decisionNumber+
-	         " state "+nvae.stateNumber+")"+
-	         " decision=<<"+nvae.grammarDecisionDescription+">>";
-	   }
-	   else
-	   {
-	       msg = super.getErrorMessage(e, tokenNames);
-	   }
-	   if(paraphrases.size() > 0)
-	   {
-	       String paraphrase = (String)paraphrases.peek();
-	       msg = msg+" "+paraphrase;
-	   }
-	   
-	   return stack+" "+msg;
-	}
-	
-	public String getTokenErrorDisplay(Token t)
-	{
-	   return t.toString();
-	}
+    public String getLongTokenErrorDisplay(Token t)
+    {
+        return t.toString();
+    }
+    
+
+    public String getErrorString(RecognitionException e)
+    {
+        String hdr = getErrorHeader(e);
+        String msg = getErrorMessage(e, this.getTokenNames());
+        return hdr+" "+msg;
+    }
 }
 
 @rulecatch
 {
-catch(RecognitionException e)
-{
-   throw e;
+    catch(RecognitionException e)
+    {
+        throw new CMISQueryException(getErrorString(e), e);
+    }
 }
+
+@lexer::members
+{
+    public Token nextToken() {
+        while (true) 
+        {
+            state.token = null;
+            state.channel = Token.DEFAULT_CHANNEL;
+            state.tokenStartCharIndex = input.index();
+            state.tokenStartCharPositionInLine = input.getCharPositionInLine();
+            state.tokenStartLine = input.getLine();
+            state.text = null;
+            if ( input.LA(1)==CharStream.EOF ) 
+            {
+                return Token.EOF_TOKEN;
+            }
+            try 
+            {
+                mTokens();
+                if ( state.token==null ) 
+                {
+                    emit();
+                }
+                else if ( state.token==Token.SKIP_TOKEN ) 
+                {
+                    continue;
+                }
+                return state.token;
+            }
+            catch (RecognitionException re) 
+            {
+                throw new CMISQueryException(getErrorString(re), re);
+            }
+        }
+    }
+    
+    public String getErrorString(RecognitionException e)
+    {
+        String hdr = getErrorHeader(e);
+        String msg = getErrorMessage(e, this.getTokenNames());
+        return hdr+" "+msg;
+    }
 }
 
 
@@ -155,14 +293,16 @@ catch(RecognitionException e)
  * The top level rule for the parser
  */
 query
+        @init {    paraphrases.push("in query"); }
+        @after{    paraphrases.pop(); } 
 	:	SELECT selectList fromClause whereClause? orderByClause? EOF
 		-> ^(QUERY selectList fromClause whereClause? orderByClause?)
 	;
 
 	
 selectList
-    @init {    paraphrases.push("in select list"); }
-    @after{    paraphrases.pop(); } 
+        @init {    paraphrases.push("in select list"); }
+        @after{    paraphrases.pop(); } 
 	:	STAR  
 		-> ^(ALL_COLUMNS)
 	| 	selectSubList ( COMMA selectSubList )*  
@@ -180,6 +320,8 @@ selectSubList
 	;
 	
 valueExpression
+        @init {    paraphrases.push("in value expression"); }
+        @after{    paraphrases.pop(); } 
 	:	columnReference 
 		-> columnReference
 	| 	valueFunction
@@ -187,6 +329,8 @@ valueExpression
 	;				
 
 columnReference
+        @init {    paraphrases.push("in column reference"); }
+        @after{    paraphrases.pop(); } 
 	:	( qualifier DOT )? columnName
 		-> ^(COLUMN_REF columnName qualifier?)
 	;
@@ -196,12 +340,18 @@ columnReference
  * TODO Add look a head and perform the test
  */	
 multiValuedColumnReference
+        @init {    paraphrases.push("in column reference"); }
+        @after{    paraphrases.pop(); } 
 	:       ( qualifier DOT )?  multiValuedColumnName
 		-> ^(COLUMN_REF multiValuedColumnName qualifier?)
 	;
 	
 valueFunction
-	:	functionName=keyWordOrId LPAREN functionArgument* RPAREN
+        @init {    paraphrases.push("in function"); }
+        @after{    paraphrases.pop(); } 
+        :       cmisFunctionName=cmisFunction LPAREN functionArgument* RPAREN
+		-> ^(FUNCTION $cmisFunctionName LPAREN functionArgument* RPAREN)
+	|	{strict == false}? =>functionName=keyWordOrId LPAREN functionArgument* RPAREN
 		-> ^(FUNCTION $functionName LPAREN functionArgument* RPAREN)
 	;
 	
@@ -220,14 +370,14 @@ qualifier
 	;
 	
 fromClause
-    @init {    paraphrases.push("in from"); }
-    @after{    paraphrases.pop(); } 
+        @init {    paraphrases.push("in from"); }
+        @after{    paraphrases.pop(); } 
 	:	FROM tableReference
 		-> tableReference
 	;
 	
-tableReference
-	:	singleTable ((joinedTable) => joinedTable)*
+tableReference   
+	:	singleTable joinedTable*
 		-> ^(SOURCE singleTable joinedTable*)
 	;
 	
@@ -242,7 +392,9 @@ singleTable
 	;
 	
 joinedTable
-	:	joinType? JOIN tableReference (joinSpecification) => joinSpecification
+        @init {    paraphrases.push("in join"); }
+        @after{    paraphrases.pop(); } 
+	:	joinType? JOIN tableReference joinSpecification
 		-> ^(JOIN tableReference joinType? joinSpecification)
 	;
 
@@ -260,6 +412,8 @@ joinType
 	;
 	
 joinSpecification
+        @init {    paraphrases.push("in join condition"); }
+        @after{    paraphrases.pop(); } 
 	:	ON lhs=columnReference EQUALS rhs=columnReference 
 		->	^(ON $lhs EQUALS $rhs)
 	;
@@ -269,8 +423,8 @@ joinSpecification
  * Broken out the left recursion from the spec 
  */
 whereClause
-    @init {    paraphrases.push("in where"); }
-    @after{    paraphrases.pop(); } 
+        @init {    paraphrases.push("in where"); }
+        @after{    paraphrases.pop(); } 
 	:	WHERE searchOrCondition
 		-> searchOrCondition
 	;
@@ -509,8 +663,13 @@ keyWord
 	| TIMESTAMP
 	| TRUE
 	| FALSE
+	| cmisFunction
 	;
 	
+cmisFunction : SCORE 
+	-> SCORE
+;
+	
 keyWordOrId 
 	:	keyWord 
 		-> keyWord
@@ -556,9 +715,11 @@ ORDER	:	('O'|'o')('R'|'r')('D'|'d')('E'|'e')('R'|'r');
 BY	:	('B'|'b')('Y'|'y');
 ASC	:	('A'|'a')('S'|'s')('C'|'c');
 DESC	:	('D'|'d')('E'|'e')('S'|'s')('C'|'c');
-TIMESTAMP : ('T'|'t')('I'|'i')('M'|'m')('E'|'e')('S'|'s')('T'|'s')('A'|'a')('M'|'m')('P'|'p');
-TRUE: ('T'|'t')('R'|'r')('U'|'u')('E'|'e');
-FALSE: ('F'|'f')('A'|'a')('L'|'l')('S'|'s')('E'|'e');
+TIMESTAMP 
+        :       ('T'|'t')('I'|'i')('M'|'m')('E'|'e')('S'|'s')('T'|'s')('A'|'a')('M'|'m')('P'|'p');
+TRUE    :       ('T'|'t')('R'|'r')('U'|'u')('E'|'e');
+FALSE   :       ('F'|'f')('A'|'a')('L'|'l')('S'|'s')('E'|'e');
+SCORE   :       ('S'|'s')('C'|'c')('O'|'o')('R'|'r')('E'|'e');
 LPAREN	:	'(' ;
 RPAREN	:	')' ;
 STAR	:	'*' ;
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens
index 3066c49d48..ba2a6cfe18 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens
@@ -1,6 +1,6 @@
 FUNCTION=10
 WHERE=46
-EXPONENT=82
+EXPONENT=83
 PRED_FTS=22
 STAR=32
 INNER=41
@@ -11,7 +11,7 @@ PRED_COMPARISON=18
 CONTAINS=60
 TABLE=12
 SOURCE=11
-DOTDOT=76
+DOTDOT=77
 EQUALS=45
 NOT=49
 ID=69
@@ -20,33 +20,33 @@ LPAREN=37
 LESSTHANOREQUALS=53
 AS=34
 RPAREN=38
-TILDA=77
+TILDA=78
 PRED_LIKE=21
 STRING_LITERAL=28
 IN=55
-DECIMAL_NUMERAL=80
+DECIMAL_NUMERAL=81
 FLOATING_POINT_LITERAL=71
 COMMA=33
 IS=57
 LEFT=42
-SIGNED_INTEGER=87
+SIGNED_INTEGER=88
 PARAMETER=14
 COLUMN=6
-PLUS=78
+PLUS=79
 QUOTED_STRING=68
-ZERO_DIGIT=84
-DIGIT=81
+ZERO_DIGIT=85
+DIGIT=82
 DOT=36
 COLUMN_REF=8
 SELECT=31
 LIKE=56
 GREATERTHAN=52
 DOTSTAR=35
-E=86
+E=87
 OUTER=43
 BY=64
 LESSTHAN=51
-NON_ZERO_DIGIT=85
+NON_ZERO_DIGIT=86
 ASC=65
 QUALIFIER=9
 CONJUNCTION=15
@@ -54,7 +54,7 @@ NULL=58
 ON=44
 NOTEQUALS=50
 DATETIME_LITERAL=29
-MINUS=79
+MINUS=80
 LIST=23
 TRUE=73
 PRED_DESCENDANT=25
@@ -65,8 +65,9 @@ GREATERTHANOREQUALS=54
 BOOLEAN_LITERAL=30
 DISJUNCTION=16
 COLUMNS=7
-WS=83
+WS=84
 ANY=59
+SCORE=76
 NEGATION=17
 TABLE_REF=13
 SORT_SPECIFICATION=26
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
index ed572b013c..911593dc74 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
@@ -1,5 +1,8 @@
-// $ANTLR !Unknown version! W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2009-10-13 15:31:44
-package org.alfresco.repo.search.impl.parsers;
+// $ANTLR !Unknown version! W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2009-10-15 15:44:01
+
+    package org.alfresco.repo.search.impl.parsers;
+    import org.alfresco.cmis.CMISQueryException;
+
 
 import org.antlr.runtime.*;
 import java.util.Stack;
@@ -9,7 +12,7 @@ import java.util.ArrayList;
 public class CMISLexer extends Lexer {
     public static final int FUNCTION=10;
     public static final int WHERE=46;
-    public static final int EXPONENT=82;
+    public static final int EXPONENT=83;
     public static final int PRED_FTS=22;
     public static final int STAR=32;
     public static final int INNER=41;
@@ -21,7 +24,7 @@ public class CMISLexer extends Lexer {
     public static final int TABLE=12;
     public static final int SOURCE=11;
     public static final int EQUALS=45;
-    public static final int DOTDOT=76;
+    public static final int DOTDOT=77;
     public static final int NOT=49;
     public static final int ID=69;
     public static final int AND=48;
@@ -30,22 +33,22 @@ public class CMISLexer extends Lexer {
     public static final int LESSTHANOREQUALS=53;
     public static final int AS=34;
     public static final int RPAREN=38;
-    public static final int TILDA=77;
+    public static final int TILDA=78;
     public static final int PRED_LIKE=21;
     public static final int STRING_LITERAL=28;
     public static final int IN=55;
-    public static final int DECIMAL_NUMERAL=80;
+    public static final int DECIMAL_NUMERAL=81;
     public static final int FLOATING_POINT_LITERAL=71;
     public static final int COMMA=33;
     public static final int IS=57;
     public static final int LEFT=42;
-    public static final int SIGNED_INTEGER=87;
+    public static final int SIGNED_INTEGER=88;
     public static final int PARAMETER=14;
     public static final int COLUMN=6;
-    public static final int PLUS=78;
+    public static final int PLUS=79;
     public static final int QUOTED_STRING=68;
-    public static final int ZERO_DIGIT=84;
-    public static final int DIGIT=81;
+    public static final int ZERO_DIGIT=85;
+    public static final int DIGIT=82;
     public static final int DOT=36;
     public static final int COLUMN_REF=8;
     public static final int SELECT=31;
@@ -53,18 +56,18 @@ public class CMISLexer extends Lexer {
     public static final int DOTSTAR=35;
     public static final int GREATERTHAN=52;
     public static final int OUTER=43;
-    public static final int E=86;
+    public static final int E=87;
     public static final int LESSTHAN=51;
     public static final int BY=64;
     public static final int ASC=65;
-    public static final int NON_ZERO_DIGIT=85;
+    public static final int NON_ZERO_DIGIT=86;
     public static final int QUALIFIER=9;
     public static final int CONJUNCTION=15;
     public static final int NULL=58;
     public static final int ON=44;
     public static final int NOTEQUALS=50;
     public static final int DATETIME_LITERAL=29;
-    public static final int MINUS=79;
+    public static final int MINUS=80;
     public static final int LIST=23;
     public static final int PRED_DESCENDANT=25;
     public static final int TRUE=73;
@@ -76,7 +79,8 @@ public class CMISLexer extends Lexer {
     public static final int COLUMNS=7;
     public static final int DISJUNCTION=16;
     public static final int ANY=59;
-    public static final int WS=83;
+    public static final int WS=84;
+    public static final int SCORE=76;
     public static final int NEGATION=17;
     public static final int TABLE_REF=13;
     public static final int SORT_SPECIFICATION=26;
@@ -93,6 +97,47 @@ public class CMISLexer extends Lexer {
     public static final int TIMESTAMP=75;
     public static final int PRED_IN=19;
 
+        public Token nextToken() {
+            while (true) 
+            {
+                state.token = null;
+                state.channel = Token.DEFAULT_CHANNEL;
+                state.tokenStartCharIndex = input.index();
+                state.tokenStartCharPositionInLine = input.getCharPositionInLine();
+                state.tokenStartLine = input.getLine();
+                state.text = null;
+                if ( input.LA(1)==CharStream.EOF ) 
+                {
+                    return Token.EOF_TOKEN;
+                }
+                try 
+                {
+                    mTokens();
+                    if ( state.token==null ) 
+                    {
+                        emit();
+                    }
+                    else if ( state.token==Token.SKIP_TOKEN ) 
+                    {
+                        continue;
+                    }
+                    return state.token;
+                }
+                catch (RecognitionException re) 
+                {
+                    throw new CMISQueryException(getErrorString(re), re);
+                }
+            }
+        }
+        
+        public String getErrorString(RecognitionException e)
+        {
+            String hdr = getErrorHeader(e);
+            String msg = getErrorMessage(e, this.getTokenNames());
+            return hdr+" "+msg;
+        }
+
+
     // delegates
     // delegators
 
@@ -111,11 +156,11 @@ public class CMISLexer extends Lexer {
         try {
             int _type = QUOTED_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:531:5: ( '\\'' (~ '\\'' | '\\'\\'' )* '\\'' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:531:9: '\\'' (~ '\\'' | '\\'\\'' )* '\\''
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:5: ( '\\'' (~ '\\'' | '\\'\\'' )* '\\'' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:9: '\\'' (~ '\\'' | '\\'\\'' )* '\\''
             {
             match('\''); 
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:531:14: (~ '\\'' | '\\'\\'' )*
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:14: (~ '\\'' | '\\'\\'' )*
             loop1:
             do {
                 int alt1=3;
@@ -137,7 +182,7 @@ public class CMISLexer extends Lexer {
 
                 switch (alt1) {
             	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:531:16: ~ '\\''
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:16: ~ '\\''
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -152,7 +197,7 @@ public class CMISLexer extends Lexer {
             	    }
             	    break;
             	case 2 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:531:24: '\\'\\''
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:24: '\\'\\''
             	    {
             	    match("''"); 
 
@@ -182,8 +227,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = SELECT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:534:8: ( ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:534:10: ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:693:8: ( ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:693:10: ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' )
             {
             if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
                 input.consume();
@@ -255,8 +300,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = AS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:535:4: ( ( 'A' | 'a' ) ( 'S' | 's' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:535:6: ( 'A' | 'a' ) ( 'S' | 's' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:694:4: ( ( 'A' | 'a' ) ( 'S' | 's' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:694:6: ( 'A' | 'a' ) ( 'S' | 's' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -292,8 +337,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = FROM;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:536:6: ( ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:536:8: ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:695:6: ( ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:695:8: ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' )
             {
             if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
                 input.consume();
@@ -347,8 +392,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = JOIN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:6: ( ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:8: ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:696:6: ( ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:696:8: ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' )
             {
             if ( input.LA(1)=='J'||input.LA(1)=='j' ) {
                 input.consume();
@@ -402,8 +447,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = INNER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:538:7: ( ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:538:9: ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:697:7: ( ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:697:9: ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -466,8 +511,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = LEFT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:539:6: ( ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:539:8: ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:698:6: ( ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:698:8: ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' )
             {
             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                 input.consume();
@@ -521,8 +566,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = OUTER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:540:7: ( ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:540:9: ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:699:7: ( ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:699:9: ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -585,8 +630,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = ON;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:541:4: ( ( 'O' | 'o' ) ( 'N' | 'n' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:541:6: ( 'O' | 'o' ) ( 'N' | 'n' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:700:4: ( ( 'O' | 'o' ) ( 'N' | 'n' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:700:6: ( 'O' | 'o' ) ( 'N' | 'n' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -622,8 +667,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = WHERE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:542:7: ( ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:542:9: ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:701:7: ( ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:701:9: ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='W'||input.LA(1)=='w' ) {
                 input.consume();
@@ -686,8 +731,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = OR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:543:4: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:543:6: ( 'O' | 'o' ) ( 'R' | 'r' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:702:4: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:702:6: ( 'O' | 'o' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -723,8 +768,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = AND;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:544:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:544:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:703:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:703:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -769,8 +814,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = NOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:545:5: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:545:7: ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:704:5: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:704:7: ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' )
             {
             if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
                 input.consume();
@@ -815,8 +860,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = IN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:4: ( ( 'I' | 'i' ) ( 'N' | 'n' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:6: ( 'I' | 'i' ) ( 'N' | 'n' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:705:4: ( ( 'I' | 'i' ) ( 'N' | 'n' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:705:6: ( 'I' | 'i' ) ( 'N' | 'n' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -852,8 +897,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = LIKE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:6: ( ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:8: ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:706:6: ( ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:706:8: ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                 input.consume();
@@ -907,8 +952,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = IS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:548:4: ( ( 'I' | 'i' ) ( 'S' | 's' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:548:6: ( 'I' | 'i' ) ( 'S' | 's' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:707:4: ( ( 'I' | 'i' ) ( 'S' | 's' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:707:6: ( 'I' | 'i' ) ( 'S' | 's' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -944,8 +989,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = NULL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:549:6: ( ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:549:8: ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:708:6: ( ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:708:8: ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' )
             {
             if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
                 input.consume();
@@ -999,8 +1044,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = ANY;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:550:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:550:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:709:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:709:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -1045,8 +1090,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = CONTAINS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:551:9: ( ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:551:11: ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:710:9: ( ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:710:11: ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' )
             {
             if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
                 input.consume();
@@ -1136,8 +1181,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = IN_FOLDER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:553:2: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:553:4: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:712:2: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:712:4: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -1228,8 +1273,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = IN_TREE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:554:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:554:11: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:713:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:713:11: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -1302,8 +1347,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = ORDER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:555:7: ( ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:555:9: ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:714:7: ( ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:714:9: ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -1366,8 +1411,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = BY;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:556:4: ( ( 'B' | 'b' ) ( 'Y' | 'y' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:556:6: ( 'B' | 'b' ) ( 'Y' | 'y' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:715:4: ( ( 'B' | 'b' ) ( 'Y' | 'y' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:715:6: ( 'B' | 'b' ) ( 'Y' | 'y' )
             {
             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                 input.consume();
@@ -1403,8 +1448,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = ASC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:557:5: ( ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:557:7: ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:716:5: ( ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:716:7: ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -1449,8 +1494,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = DESC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:558:6: ( ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:558:8: ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:717:6: ( ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:717:8: ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' )
             {
             if ( input.LA(1)=='D'||input.LA(1)=='d' ) {
                 input.consume();
@@ -1504,8 +1549,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = TIMESTAMP;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:559:11: ( ( 'T' | 't' ) ( 'I' | 'i' ) ( 'M' | 'm' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'T' | 's' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ( 'P' | 'p' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:559:13: ( 'T' | 't' ) ( 'I' | 'i' ) ( 'M' | 'm' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'T' | 's' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ( 'P' | 'p' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:719:9: ( ( 'T' | 't' ) ( 'I' | 'i' ) ( 'M' | 'm' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'T' | 's' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ( 'P' | 'p' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:719:17: ( 'T' | 't' ) ( 'I' | 'i' ) ( 'M' | 'm' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'T' | 's' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ( 'P' | 'p' )
             {
             if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
                 input.consume();
@@ -1604,8 +1649,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = TRUE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:560:5: ( ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:560:7: ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:720:9: ( ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:720:17: ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
                 input.consume();
@@ -1659,8 +1704,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = FALSE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:561:6: ( ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:561:8: ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:721:9: ( ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:721:17: ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
                 input.consume();
@@ -1718,13 +1763,77 @@ public class CMISLexer extends Lexer {
     }
     // $ANTLR end "FALSE"
 
+    // $ANTLR start "SCORE"
+    public final void mSCORE() throws RecognitionException {
+        try {
+            int _type = SCORE;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:722:9: ( ( 'S' | 's' ) ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:722:17: ( 'S' | 's' ) ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'E' | 'e' )
+            {
+            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
+
+            if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
+
+            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
+
+            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
+
+            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "SCORE"
+
     // $ANTLR start "LPAREN"
     public final void mLPAREN() throws RecognitionException {
         try {
             int _type = LPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:562:8: ( '(' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:562:10: '('
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:723:8: ( '(' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:723:10: '('
             {
             match('('); 
 
@@ -1743,8 +1852,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = RPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:563:8: ( ')' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:563:10: ')'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:724:8: ( ')' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:724:10: ')'
             {
             match(')'); 
 
@@ -1763,8 +1872,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = STAR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:564:6: ( '*' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:564:8: '*'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:725:6: ( '*' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:725:8: '*'
             {
             match('*'); 
 
@@ -1783,8 +1892,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = COMMA;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:565:7: ( ',' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:565:9: ','
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:726:7: ( ',' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:726:9: ','
             {
             match(','); 
 
@@ -1803,8 +1912,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = DOTSTAR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:566:9: ( '.*' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:566:11: '.*'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:727:9: ( '.*' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:727:11: '.*'
             {
             match(".*"); 
 
@@ -1824,8 +1933,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = DOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:567:5: ( '.' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:567:7: '.'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:728:5: ( '.' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:728:7: '.'
             {
             match('.'); 
 
@@ -1844,8 +1953,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = DOTDOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:568:8: ( '..' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:568:10: '..'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:729:8: ( '..' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:729:10: '..'
             {
             match(".."); 
 
@@ -1865,8 +1974,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = EQUALS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:569:9: ( '=' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:569:11: '='
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:730:9: ( '=' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:730:11: '='
             {
             match('='); 
 
@@ -1885,8 +1994,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = TILDA;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:570:7: ( '~' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:570:9: '~'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:731:7: ( '~' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:731:9: '~'
             {
             match('~'); 
 
@@ -1905,8 +2014,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = NOTEQUALS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:572:2: ( '<>' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:572:4: '<>'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:733:2: ( '<>' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:733:4: '<>'
             {
             match("<>"); 
 
@@ -1926,8 +2035,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = GREATERTHAN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:574:2: ( '>' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:574:4: '>'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:735:2: ( '>' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:735:4: '>'
             {
             match('>'); 
 
@@ -1946,8 +2055,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = LESSTHAN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:2: ( '<' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:4: '<'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:737:2: ( '<' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:737:4: '<'
             {
             match('<'); 
 
@@ -1966,8 +2075,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = GREATERTHANOREQUALS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:578:2: ( '>=' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:578:4: '>='
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:739:2: ( '>=' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:739:4: '>='
             {
             match(">="); 
 
@@ -1987,8 +2096,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = LESSTHANOREQUALS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:580:2: ( '<=' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:580:4: '<='
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:741:2: ( '<=' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:741:4: '<='
             {
             match("<="); 
 
@@ -2008,8 +2117,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = COLON;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:581:7: ( ':' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:581:9: ':'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:742:7: ( ':' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:742:9: ':'
             {
             match(':'); 
 
@@ -2028,8 +2137,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = DOUBLE_QUOTE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:584:2: ( '\"' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:584:4: '\"'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:745:2: ( '\"' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:745:4: '\"'
             {
             match('\"'); 
 
@@ -2048,10 +2157,10 @@ public class CMISLexer extends Lexer {
         try {
             int _type = DECIMAL_INTEGER_LITERAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:592:9: ( ( PLUS | MINUS )? DECIMAL_NUMERAL )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:592:11: ( PLUS | MINUS )? DECIMAL_NUMERAL
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:753:9: ( ( PLUS | MINUS )? DECIMAL_NUMERAL )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:753:11: ( PLUS | MINUS )? DECIMAL_NUMERAL
             {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:592:11: ( PLUS | MINUS )?
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:753:11: ( PLUS | MINUS )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -2094,14 +2203,14 @@ public class CMISLexer extends Lexer {
         try {
             int _type = FLOATING_POINT_LITERAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:2: ( ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? | ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )? | ( PLUS | MINUS )? ( DIGIT )+ EXPONENT )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:2: ( ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? | ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )? | ( PLUS | MINUS )? ( DIGIT )+ EXPONENT )
             int alt12=3;
             alt12 = dfa12.predict(input);
             switch (alt12) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:4: ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:4: ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )?
                     {
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:4: ( PLUS | MINUS )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:4: ( PLUS | MINUS )?
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -2127,7 +2236,7 @@ public class CMISLexer extends Lexer {
 
                     }
 
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:22: ( DIGIT )+
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:22: ( DIGIT )+
                     int cnt4=0;
                     loop4:
                     do {
@@ -2141,7 +2250,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt4) {
                     	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:22: DIGIT
+                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:22: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2158,7 +2267,7 @@ public class CMISLexer extends Lexer {
                     } while (true);
 
                     mDOT(); 
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:33: ( DIGIT )*
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:33: ( DIGIT )*
                     loop5:
                     do {
                         int alt5=2;
@@ -2171,7 +2280,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt5) {
                     	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:33: DIGIT
+                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:33: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2183,7 +2292,7 @@ public class CMISLexer extends Lexer {
                         }
                     } while (true);
 
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:40: ( EXPONENT )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:40: ( EXPONENT )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2192,7 +2301,7 @@ public class CMISLexer extends Lexer {
                     }
                     switch (alt6) {
                         case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:40: EXPONENT
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:40: EXPONENT
                             {
                             mEXPONENT(); 
 
@@ -2205,9 +2314,9 @@ public class CMISLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:600:4: ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:761:4: ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )?
                     {
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:600:4: ( PLUS | MINUS )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:761:4: ( PLUS | MINUS )?
                     int alt7=2;
                     int LA7_0 = input.LA(1);
 
@@ -2234,7 +2343,7 @@ public class CMISLexer extends Lexer {
                     }
 
                     mDOT(); 
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:600:26: ( DIGIT )+
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:761:26: ( DIGIT )+
                     int cnt8=0;
                     loop8:
                     do {
@@ -2248,7 +2357,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt8) {
                     	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:600:26: DIGIT
+                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:761:26: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2264,7 +2373,7 @@ public class CMISLexer extends Lexer {
                         cnt8++;
                     } while (true);
 
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:600:33: ( EXPONENT )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:761:33: ( EXPONENT )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -2273,7 +2382,7 @@ public class CMISLexer extends Lexer {
                     }
                     switch (alt9) {
                         case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:600:33: EXPONENT
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:761:33: EXPONENT
                             {
                             mEXPONENT(); 
 
@@ -2286,9 +2395,9 @@ public class CMISLexer extends Lexer {
                     }
                     break;
                 case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:4: ( PLUS | MINUS )? ( DIGIT )+ EXPONENT
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:762:4: ( PLUS | MINUS )? ( DIGIT )+ EXPONENT
                     {
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:4: ( PLUS | MINUS )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:762:4: ( PLUS | MINUS )?
                     int alt10=2;
                     int LA10_0 = input.LA(1);
 
@@ -2314,7 +2423,7 @@ public class CMISLexer extends Lexer {
 
                     }
 
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:22: ( DIGIT )+
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:762:22: ( DIGIT )+
                     int cnt11=0;
                     loop11:
                     do {
@@ -2328,7 +2437,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt11) {
                     	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:22: DIGIT
+                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:762:22: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2363,8 +2472,8 @@ public class CMISLexer extends Lexer {
         try {
             int _type = ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:608:4: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )* )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:608:6: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )*
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:769:4: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )* )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:769:6: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )*
             {
             if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
                 input.consume();
@@ -2375,7 +2484,7 @@ public class CMISLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:608:29: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )*
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:769:29: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )*
             loop13:
             do {
                 int alt13=2;
@@ -2424,10 +2533,10 @@ public class CMISLexer extends Lexer {
         try {
             int _type = WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:610:4: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:610:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:771:4: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:771:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:610:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:771:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt14=0;
             loop14:
             do {
@@ -2480,7 +2589,7 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "DECIMAL_NUMERAL"
     public final void mDECIMAL_NUMERAL() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:619:2: ( ZERO_DIGIT | NON_ZERO_DIGIT ( DIGIT )* )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:780:2: ( ZERO_DIGIT | NON_ZERO_DIGIT ( DIGIT )* )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -2498,17 +2607,17 @@ public class CMISLexer extends Lexer {
             }
             switch (alt16) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:619:4: ZERO_DIGIT
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:780:4: ZERO_DIGIT
                     {
                     mZERO_DIGIT(); 
 
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:620:4: NON_ZERO_DIGIT ( DIGIT )*
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:781:4: NON_ZERO_DIGIT ( DIGIT )*
                     {
                     mNON_ZERO_DIGIT(); 
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:620:19: ( DIGIT )*
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:781:19: ( DIGIT )*
                     loop15:
                     do {
                         int alt15=2;
@@ -2521,7 +2630,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt15) {
                     	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:620:19: DIGIT
+                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:781:19: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2547,7 +2656,7 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "DIGIT"
     public final void mDIGIT() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:7: ( ZERO_DIGIT | NON_ZERO_DIGIT )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:784:7: ( ZERO_DIGIT | NON_ZERO_DIGIT )
             // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
             {
             if ( (input.LA(1)>='0' && input.LA(1)<='9') ) {
@@ -2571,8 +2680,8 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "ZERO_DIGIT"
     public final void mZERO_DIGIT() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:626:2: ( '0' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:626:4: '0'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:787:2: ( '0' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:787:4: '0'
             {
             match('0'); 
 
@@ -2587,8 +2696,8 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "NON_ZERO_DIGIT"
     public final void mNON_ZERO_DIGIT() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:629:2: ( '1' .. '9' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:629:4: '1' .. '9'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:790:2: ( '1' .. '9' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:790:4: '1' .. '9'
             {
             matchRange('1','9'); 
 
@@ -2603,8 +2712,8 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "PLUS"
     public final void mPLUS() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:631:6: ( '+' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:631:8: '+'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:792:6: ( '+' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:792:8: '+'
             {
             match('+'); 
 
@@ -2619,8 +2728,8 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "MINUS"
     public final void mMINUS() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:633:7: ( '-' )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:633:9: '-'
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:794:7: ( '-' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:794:9: '-'
             {
             match('-'); 
 
@@ -2635,8 +2744,8 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "E"
     public final void mE() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:636:3: ( ( 'e' | 'E' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:636:5: ( 'e' | 'E' )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:797:3: ( ( 'e' | 'E' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:797:5: ( 'e' | 'E' )
             {
             if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                 input.consume();
@@ -2659,8 +2768,8 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "EXPONENT"
     public final void mEXPONENT() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:647:2: ( E SIGNED_INTEGER )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:647:4: E SIGNED_INTEGER
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:808:2: ( E SIGNED_INTEGER )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:808:4: E SIGNED_INTEGER
             {
             mE(); 
             mSIGNED_INTEGER(); 
@@ -2676,10 +2785,10 @@ public class CMISLexer extends Lexer {
     // $ANTLR start "SIGNED_INTEGER"
     public final void mSIGNED_INTEGER() throws RecognitionException {
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:651:2: ( ( PLUS | MINUS )? ( DIGIT )+ )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:651:4: ( PLUS | MINUS )? ( DIGIT )+
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:812:2: ( ( PLUS | MINUS )? ( DIGIT )+ )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:812:4: ( PLUS | MINUS )? ( DIGIT )+
             {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:651:4: ( PLUS | MINUS )?
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:812:4: ( PLUS | MINUS )?
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2705,7 +2814,7 @@ public class CMISLexer extends Lexer {
 
             }
 
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:651:20: ( DIGIT )+
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:812:20: ( DIGIT )+
             int cnt18=0;
             loop18:
             do {
@@ -2719,7 +2828,7 @@ public class CMISLexer extends Lexer {
 
                 switch (alt18) {
             	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:651:20: DIGIT
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:812:20: DIGIT
             	    {
             	    mDIGIT(); 
 
@@ -2745,8 +2854,8 @@ public class CMISLexer extends Lexer {
     // $ANTLR end "SIGNED_INTEGER"
 
     public void mTokens() throws RecognitionException {
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:8: ( QUOTED_STRING | SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | LPAREN | RPAREN | STAR | COMMA | DOTSTAR | DOT | DOTDOT | EQUALS | TILDA | NOTEQUALS | GREATERTHAN | LESSTHAN | GREATERTHANOREQUALS | LESSTHANOREQUALS | COLON | DOUBLE_QUOTE | DECIMAL_INTEGER_LITERAL | FLOATING_POINT_LITERAL | ID | WS )
-        int alt19=48;
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:8: ( QUOTED_STRING | SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | SCORE | LPAREN | RPAREN | STAR | COMMA | DOTSTAR | DOT | DOTDOT | EQUALS | TILDA | NOTEQUALS | GREATERTHAN | LESSTHAN | GREATERTHANOREQUALS | LESSTHANOREQUALS | COLON | DOUBLE_QUOTE | DECIMAL_INTEGER_LITERAL | FLOATING_POINT_LITERAL | ID | WS )
+        int alt19=49;
         alt19 = dfa19.predict(input);
         switch (alt19) {
             case 1 :
@@ -2946,140 +3055,147 @@ public class CMISLexer extends Lexer {
                 }
                 break;
             case 29 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:167: LPAREN
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:167: SCORE
+                {
+                mSCORE(); 
+
+                }
+                break;
+            case 30 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:173: LPAREN
                 {
                 mLPAREN(); 
 
                 }
                 break;
-            case 30 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:174: RPAREN
+            case 31 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:180: RPAREN
                 {
                 mRPAREN(); 
 
                 }
                 break;
-            case 31 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:181: STAR
+            case 32 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:187: STAR
                 {
                 mSTAR(); 
 
                 }
                 break;
-            case 32 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:186: COMMA
+            case 33 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:192: COMMA
                 {
                 mCOMMA(); 
 
                 }
                 break;
-            case 33 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:192: DOTSTAR
+            case 34 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:198: DOTSTAR
                 {
                 mDOTSTAR(); 
 
                 }
                 break;
-            case 34 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:200: DOT
+            case 35 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:206: DOT
                 {
                 mDOT(); 
 
                 }
                 break;
-            case 35 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:204: DOTDOT
+            case 36 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:210: DOTDOT
                 {
                 mDOTDOT(); 
 
                 }
                 break;
-            case 36 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:211: EQUALS
+            case 37 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:217: EQUALS
                 {
                 mEQUALS(); 
 
                 }
                 break;
-            case 37 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:218: TILDA
+            case 38 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:224: TILDA
                 {
                 mTILDA(); 
 
                 }
                 break;
-            case 38 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:224: NOTEQUALS
+            case 39 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:230: NOTEQUALS
                 {
                 mNOTEQUALS(); 
 
                 }
                 break;
-            case 39 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:234: GREATERTHAN
+            case 40 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:240: GREATERTHAN
                 {
                 mGREATERTHAN(); 
 
                 }
                 break;
-            case 40 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:246: LESSTHAN
+            case 41 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:252: LESSTHAN
                 {
                 mLESSTHAN(); 
 
                 }
                 break;
-            case 41 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:255: GREATERTHANOREQUALS
+            case 42 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:261: GREATERTHANOREQUALS
                 {
                 mGREATERTHANOREQUALS(); 
 
                 }
                 break;
-            case 42 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:275: LESSTHANOREQUALS
+            case 43 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:281: LESSTHANOREQUALS
                 {
                 mLESSTHANOREQUALS(); 
 
                 }
                 break;
-            case 43 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:292: COLON
+            case 44 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:298: COLON
                 {
                 mCOLON(); 
 
                 }
                 break;
-            case 44 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:298: DOUBLE_QUOTE
+            case 45 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:304: DOUBLE_QUOTE
                 {
                 mDOUBLE_QUOTE(); 
 
                 }
                 break;
-            case 45 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:311: DECIMAL_INTEGER_LITERAL
+            case 46 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:317: DECIMAL_INTEGER_LITERAL
                 {
                 mDECIMAL_INTEGER_LITERAL(); 
 
                 }
                 break;
-            case 46 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:335: FLOATING_POINT_LITERAL
+            case 47 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:341: FLOATING_POINT_LITERAL
                 {
                 mFLOATING_POINT_LITERAL(); 
 
                 }
                 break;
-            case 47 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:358: ID
+            case 48 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:364: ID
                 {
                 mID(); 
 
                 }
                 break;
-            case 48 :
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:361: WS
+            case 49 :
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:367: WS
                 {
                 mWS(); 
 
@@ -3144,57 +3260,57 @@ public class CMISLexer extends Lexer {
             this.transition = DFA12_transition;
         }
         public String getDescription() {
-            return "598:1: FLOATING_POINT_LITERAL : ( ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? | ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )? | ( PLUS | MINUS )? ( DIGIT )+ EXPONENT );";
+            return "759:1: FLOATING_POINT_LITERAL : ( ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? | ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )? | ( PLUS | MINUS )? ( DIGIT )+ EXPONENT );";
         }
     }
     static final String DFA19_eotS =
-        "\2\uffff\15\35\4\uffff\1\66\2\uffff\1\72\1\74\3\uffff\2\75\2\uffff"+
-        "\1\35\1\101\4\35\1\111\1\112\3\35\1\116\1\120\4\35\1\125\3\35\12"+
-        "\uffff\1\75\1\35\1\132\1\uffff\1\133\1\134\5\35\2\uffff\3\35\1\uffff"+
-        "\1\35\1\uffff\1\35\1\150\2\35\1\uffff\4\35\3\uffff\1\157\1\35\1"+
-        "\161\3\35\1\165\1\166\3\35\1\uffff\1\172\1\35\1\174\1\35\1\176\1"+
-        "\35\1\uffff\1\u0080\1\uffff\1\u0081\2\35\2\uffff\1\u0084\1\u0085"+
-        "\1\u0086\1\uffff\1\35\1\uffff\1\35\1\uffff\1\u0089\2\uffff\2\35"+
-        "\3\uffff\2\35\1\uffff\1\35\1\u008f\3\35\1\uffff\1\u0093\1\35\1\u0095"+
-        "\1\uffff\1\u0096\2\uffff";
+        "\2\uffff\15\35\4\uffff\1\67\2\uffff\1\73\1\75\3\uffff\2\76\2\uffff"+
+        "\2\35\1\103\4\35\1\113\1\114\3\35\1\120\1\122\4\35\1\127\3\35\12"+
+        "\uffff\1\76\2\35\1\135\1\uffff\1\136\1\137\5\35\2\uffff\3\35\1\uffff"+
+        "\1\35\1\uffff\1\35\1\153\2\35\1\uffff\5\35\3\uffff\1\163\1\35\1"+
+        "\165\3\35\1\171\1\172\3\35\1\uffff\1\176\1\35\1\u0080\1\35\1\u0082"+
+        "\1\35\1\u0084\1\uffff\1\u0085\1\uffff\1\u0086\2\35\2\uffff\1\u0089"+
+        "\1\u008a\1\u008b\1\uffff\1\35\1\uffff\1\35\1\uffff\1\u008e\3\uffff"+
+        "\2\35\3\uffff\2\35\1\uffff\1\35\1\u0094\3\35\1\uffff\1\u0098\1\35"+
+        "\1\u009a\1\uffff\1\u009b\2\uffff";
     static final String DFA19_eofS =
-        "\u0097\uffff";
+        "\u009c\uffff";
     static final String DFA19_minS =
-        "\1\11\1\uffff\1\105\1\116\1\101\1\117\1\116\1\105\1\116\1\110\2"+
+        "\1\11\1\uffff\1\103\1\116\1\101\1\117\1\116\1\105\1\116\1\110\2"+
         "\117\1\131\1\105\1\111\4\uffff\1\52\2\uffff\2\75\2\uffff\3\56\2"+
-        "\uffff\1\114\1\43\1\104\1\117\1\114\1\111\2\43\1\106\1\113\1\124"+
-        "\2\43\1\105\1\124\1\114\1\116\1\43\1\123\1\115\1\125\12\uffff\1"+
-        "\56\1\105\1\43\1\uffff\2\43\1\115\1\123\1\116\1\105\1\106\2\uffff"+
-        "\1\124\2\105\1\uffff\1\105\1\uffff\1\122\1\43\1\114\1\124\1\uffff"+
-        "\1\103\2\105\1\103\3\uffff\1\43\1\105\1\43\1\122\1\117\1\122\2\43"+
-        "\2\122\1\105\1\uffff\1\43\1\101\1\43\1\123\1\43\1\124\1\uffff\1"+
-        "\43\1\uffff\1\43\1\114\1\105\2\uffff\3\43\1\uffff\1\111\1\uffff"+
-        "\1\124\1\uffff\1\43\2\uffff\1\104\1\105\3\uffff\1\116\1\101\1\uffff"+
-        "\1\105\1\43\1\123\1\115\1\122\1\uffff\1\43\1\120\1\43\1\uffff\1"+
-        "\43\2\uffff";
+        "\uffff\1\114\1\117\1\43\1\104\1\117\1\114\1\111\2\43\1\106\1\113"+
+        "\1\124\2\43\1\105\1\124\1\114\1\116\1\43\1\123\1\115\1\125\12\uffff"+
+        "\1\56\1\105\1\122\1\43\1\uffff\2\43\1\115\1\123\1\116\1\105\1\106"+
+        "\2\uffff\1\124\2\105\1\uffff\1\105\1\uffff\1\122\1\43\1\114\1\124"+
+        "\1\uffff\1\103\2\105\1\103\1\105\3\uffff\1\43\1\105\1\43\1\122\1"+
+        "\117\1\122\2\43\2\122\1\105\1\uffff\1\43\1\101\1\43\1\123\1\43\1"+
+        "\124\1\43\1\uffff\1\43\1\uffff\1\43\1\114\1\105\2\uffff\3\43\1\uffff"+
+        "\1\111\1\uffff\1\124\1\uffff\1\43\3\uffff\1\104\1\105\3\uffff\1"+
+        "\116\1\101\1\uffff\1\105\1\43\1\123\1\115\1\122\1\uffff\1\43\1\120"+
+        "\1\43\1\uffff\1\43\2\uffff";
     static final String DFA19_maxS =
         "\1\176\1\uffff\1\145\1\163\1\162\1\157\1\163\1\151\1\165\1\150"+
         "\1\165\1\157\1\171\1\145\1\162\4\uffff\1\71\2\uffff\1\76\1\75\2"+
-        "\uffff\1\71\2\145\2\uffff\1\154\1\172\1\171\1\157\1\154\1\151\2"+
-        "\172\1\146\1\153\1\164\2\172\1\145\1\164\1\154\1\156\1\172\1\163"+
-        "\1\155\1\165\12\uffff\2\145\1\172\1\uffff\2\172\1\155\1\163\1\156"+
-        "\1\145\1\164\2\uffff\1\164\2\145\1\uffff\1\145\1\uffff\1\162\1\172"+
-        "\1\154\1\164\1\uffff\1\143\2\145\1\143\3\uffff\1\172\1\145\1\172"+
-        "\1\162\1\157\1\162\2\172\2\162\1\145\1\uffff\1\172\1\141\1\172\1"+
-        "\163\1\172\1\164\1\uffff\1\172\1\uffff\1\172\1\154\1\145\2\uffff"+
-        "\3\172\1\uffff\1\151\1\uffff\1\163\1\uffff\1\172\2\uffff\1\144\1"+
-        "\145\3\uffff\1\156\1\141\1\uffff\1\145\1\172\1\163\1\155\1\162\1"+
-        "\uffff\1\172\1\160\1\172\1\uffff\1\172\2\uffff";
+        "\uffff\1\71\2\145\2\uffff\1\154\1\157\1\172\1\171\1\157\1\154\1"+
+        "\151\2\172\1\146\1\153\1\164\2\172\1\145\1\164\1\154\1\156\1\172"+
+        "\1\163\1\155\1\165\12\uffff\2\145\1\162\1\172\1\uffff\2\172\1\155"+
+        "\1\163\1\156\1\145\1\164\2\uffff\1\164\2\145\1\uffff\1\145\1\uffff"+
+        "\1\162\1\172\1\154\1\164\1\uffff\1\143\2\145\1\143\1\145\3\uffff"+
+        "\1\172\1\145\1\172\1\162\1\157\1\162\2\172\2\162\1\145\1\uffff\1"+
+        "\172\1\141\1\172\1\163\1\172\1\164\1\172\1\uffff\1\172\1\uffff\1"+
+        "\172\1\154\1\145\2\uffff\3\172\1\uffff\1\151\1\uffff\1\163\1\uffff"+
+        "\1\172\3\uffff\1\144\1\145\3\uffff\1\156\1\141\1\uffff\1\145\1\172"+
+        "\1\163\1\155\1\162\1\uffff\1\172\1\160\1\172\1\uffff\1\172\2\uffff";
     static final String DFA19_acceptS =
-        "\1\uffff\1\1\15\uffff\1\35\1\36\1\37\1\40\1\uffff\1\44\1\45\2\uffff"+
-        "\1\53\1\54\3\uffff\1\57\1\60\25\uffff\1\41\1\43\1\42\1\56\1\46\1"+
-        "\52\1\50\1\51\1\47\1\55\3\uffff\1\3\7\uffff\1\16\1\20\3\uffff\1"+
-        "\11\1\uffff\1\13\4\uffff\1\27\4\uffff\1\30\1\14\1\22\13\uffff\1"+
-        "\15\6\uffff\1\4\1\uffff\1\5\3\uffff\1\7\1\17\3\uffff\1\21\1\uffff"+
-        "\1\31\1\uffff\1\33\1\uffff\1\34\1\6\2\uffff\1\10\1\26\1\12\2\uffff"+
-        "\1\2\5\uffff\1\25\3\uffff\1\23\1\uffff\1\24\1\32";
+        "\1\uffff\1\1\15\uffff\1\36\1\37\1\40\1\41\1\uffff\1\45\1\46\2\uffff"+
+        "\1\54\1\55\3\uffff\1\60\1\61\26\uffff\1\42\1\44\1\43\1\57\1\47\1"+
+        "\53\1\51\1\52\1\50\1\56\4\uffff\1\3\7\uffff\1\16\1\20\3\uffff\1"+
+        "\11\1\uffff\1\13\4\uffff\1\27\5\uffff\1\30\1\14\1\22\13\uffff\1"+
+        "\15\7\uffff\1\4\1\uffff\1\5\3\uffff\1\7\1\17\3\uffff\1\21\1\uffff"+
+        "\1\31\1\uffff\1\33\1\uffff\1\35\1\34\1\6\2\uffff\1\10\1\26\1\12"+
+        "\2\uffff\1\2\5\uffff\1\25\3\uffff\1\23\1\uffff\1\24\1\32";
     static final String DFA19_specialS =
-        "\u0097\uffff}>";
+        "\u009c\uffff}>";
     static final String[] DFA19_transitionS = {
             "\2\36\2\uffff\1\36\22\uffff\1\36\1\uffff\1\31\4\uffff\1\1\1"+
             "\17\1\20\1\21\1\32\1\22\1\32\1\23\1\uffff\1\33\11\34\1\30\1"+
@@ -3204,75 +3320,77 @@ public class CMISLexer extends Lexer {
             "\1\6\1\5\1\35\1\7\1\35\1\12\1\10\3\35\1\2\1\16\2\35\1\11\3\35"+
             "\3\uffff\1\25",
             "",
-            "\1\37\37\uffff\1\37",
-            "\1\41\4\uffff\1\40\32\uffff\1\41\4\uffff\1\40",
-            "\1\43\20\uffff\1\42\16\uffff\1\43\20\uffff\1\42",
-            "\1\44\37\uffff\1\44",
-            "\1\45\4\uffff\1\46\32\uffff\1\45\4\uffff\1\46",
-            "\1\47\3\uffff\1\50\33\uffff\1\47\3\uffff\1\50",
-            "\1\52\3\uffff\1\53\2\uffff\1\51\30\uffff\1\52\3\uffff\1\53"+
-            "\2\uffff\1\51",
-            "\1\54\37\uffff\1\54",
-            "\1\55\5\uffff\1\56\31\uffff\1\55\5\uffff\1\56",
-            "\1\57\37\uffff\1\57",
+            "\1\40\1\uffff\1\37\35\uffff\1\40\1\uffff\1\37",
+            "\1\42\4\uffff\1\41\32\uffff\1\42\4\uffff\1\41",
+            "\1\44\20\uffff\1\43\16\uffff\1\44\20\uffff\1\43",
+            "\1\45\37\uffff\1\45",
+            "\1\46\4\uffff\1\47\32\uffff\1\46\4\uffff\1\47",
+            "\1\50\3\uffff\1\51\33\uffff\1\50\3\uffff\1\51",
+            "\1\53\3\uffff\1\54\2\uffff\1\52\30\uffff\1\53\3\uffff\1\54"+
+            "\2\uffff\1\52",
+            "\1\55\37\uffff\1\55",
+            "\1\56\5\uffff\1\57\31\uffff\1\56\5\uffff\1\57",
             "\1\60\37\uffff\1\60",
             "\1\61\37\uffff\1\61",
-            "\1\62\10\uffff\1\63\26\uffff\1\62\10\uffff\1\63",
+            "\1\62\37\uffff\1\62",
+            "\1\63\10\uffff\1\64\26\uffff\1\63\10\uffff\1\64",
             "",
             "",
             "",
             "",
-            "\1\64\3\uffff\1\65\1\uffff\12\67",
+            "\1\65\3\uffff\1\66\1\uffff\12\70",
             "",
             "",
-            "\1\71\1\70",
-            "\1\73",
+            "\1\72\1\71",
+            "\1\74",
             "",
             "",
-            "\1\67\1\uffff\1\33\11\34",
-            "\1\67\1\uffff\12\67\13\uffff\1\67\37\uffff\1\67",
-            "\1\67\1\uffff\12\76\13\uffff\1\67\37\uffff\1\67",
+            "\1\70\1\uffff\1\33\11\34",
+            "\1\70\1\uffff\12\70\13\uffff\1\70\37\uffff\1\70",
+            "\1\70\1\uffff\12\77\13\uffff\1\70\37\uffff\1\70",
             "",
             "",
-            "\1\77\37\uffff\1\77",
-            "\2\35\13\uffff\13\35\6\uffff\2\35\1\100\27\35\4\uffff\1\35"+
-            "\1\uffff\2\35\1\100\27\35",
-            "\1\102\24\uffff\1\103\12\uffff\1\102\24\uffff\1\103",
-            "\1\104\37\uffff\1\104",
-            "\1\105\37\uffff\1\105",
+            "\1\100\37\uffff\1\100",
+            "\1\101\37\uffff\1\101",
+            "\2\35\13\uffff\13\35\6\uffff\2\35\1\102\27\35\4\uffff\1\35"+
+            "\1\uffff\2\35\1\102\27\35",
+            "\1\104\24\uffff\1\105\12\uffff\1\104\24\uffff\1\105",
             "\1\106\37\uffff\1\106",
-            "\2\35\13\uffff\13\35\6\uffff\15\35\1\107\14\35\4\uffff\1\110"+
-            "\1\uffff\15\35\1\107\14\35",
+            "\1\107\37\uffff\1\107",
+            "\1\110\37\uffff\1\110",
+            "\2\35\13\uffff\13\35\6\uffff\15\35\1\111\14\35\4\uffff\1\112"+
+            "\1\uffff\15\35\1\111\14\35",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "\1\113\37\uffff\1\113",
-            "\1\114\37\uffff\1\114",
             "\1\115\37\uffff\1\115",
+            "\1\116\37\uffff\1\116",
+            "\1\117\37\uffff\1\117",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "\2\35\13\uffff\13\35\6\uffff\3\35\1\117\26\35\4\uffff\1\35"+
-            "\1\uffff\3\35\1\117\26\35",
-            "\1\121\37\uffff\1\121",
-            "\1\122\37\uffff\1\122",
+            "\2\35\13\uffff\13\35\6\uffff\3\35\1\121\26\35\4\uffff\1\35"+
+            "\1\uffff\3\35\1\121\26\35",
             "\1\123\37\uffff\1\123",
             "\1\124\37\uffff\1\124",
-            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
-            "\35",
+            "\1\125\37\uffff\1\125",
             "\1\126\37\uffff\1\126",
-            "\1\127\37\uffff\1\127",
+            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
+            "\35",
             "\1\130\37\uffff\1\130",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\67\1\uffff\12\76\13\uffff\1\67\37\uffff\1\67",
             "\1\131\37\uffff\1\131",
+            "\1\132\37\uffff\1\132",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "\1\70\1\uffff\12\77\13\uffff\1\70\37\uffff\1\70",
+            "\1\133\37\uffff\1\133",
+            "\1\134\37\uffff\1\134",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
             "",
@@ -3280,100 +3398,104 @@ public class CMISLexer extends Lexer {
             "\35",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "\1\135\37\uffff\1\135",
-            "\1\136\37\uffff\1\136",
-            "\1\137\37\uffff\1\137",
             "\1\140\37\uffff\1\140",
-            "\1\141\15\uffff\1\142\21\uffff\1\141\15\uffff\1\142",
-            "",
-            "",
+            "\1\141\37\uffff\1\141",
+            "\1\142\37\uffff\1\142",
             "\1\143\37\uffff\1\143",
-            "\1\144\37\uffff\1\144",
-            "\1\145\37\uffff\1\145",
+            "\1\144\15\uffff\1\145\21\uffff\1\144\15\uffff\1\145",
+            "",
             "",
             "\1\146\37\uffff\1\146",
-            "",
             "\1\147\37\uffff\1\147",
+            "\1\150\37\uffff\1\150",
+            "",
+            "\1\151\37\uffff\1\151",
+            "",
+            "\1\152\37\uffff\1\152",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "\1\151\37\uffff\1\151",
-            "\1\152\37\uffff\1\152",
-            "",
-            "\1\153\37\uffff\1\153",
             "\1\154\37\uffff\1\154",
             "\1\155\37\uffff\1\155",
+            "",
             "\1\156\37\uffff\1\156",
-            "",
-            "",
-            "",
-            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
-            "\35",
+            "\1\157\37\uffff\1\157",
             "\1\160\37\uffff\1\160",
+            "\1\161\37\uffff\1\161",
+            "\1\162\37\uffff\1\162",
+            "",
+            "",
+            "",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "\1\162\37\uffff\1\162",
-            "\1\163\37\uffff\1\163",
             "\1\164\37\uffff\1\164",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
-            "\35",
+            "\1\166\37\uffff\1\166",
             "\1\167\37\uffff\1\167",
             "\1\170\37\uffff\1\170",
-            "\1\171\37\uffff\1\171",
-            "",
+            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
+            "\35",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
             "\1\173\37\uffff\1\173",
-            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
-            "\35",
+            "\1\174\37\uffff\1\174",
             "\1\175\37\uffff\1\175",
+            "",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
             "\1\177\37\uffff\1\177",
-            "",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "",
+            "\1\u0081\37\uffff\1\u0081",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "\1\u0082\37\uffff\1\u0082",
             "\1\u0083\37\uffff\1\u0083",
-            "",
-            "",
-            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
-            "\35",
-            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
-            "\35",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
             "",
+            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
+            "\35",
+            "",
+            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
+            "\35",
             "\1\u0087\37\uffff\1\u0087",
+            "\1\u0088\37\uffff\1\u0088",
             "",
-            "\1\u0088\36\uffff\1\u0088",
             "",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "",
-            "",
-            "\1\u008a\37\uffff\1\u008a",
-            "\1\u008b\37\uffff\1\u008b",
-            "",
-            "",
+            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
+            "\35",
+            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
+            "\35",
             "",
             "\1\u008c\37\uffff\1\u008c",
-            "\1\u008d\37\uffff\1\u008d",
             "",
-            "\1\u008e\37\uffff\1\u008e",
+            "\1\u008d\36\uffff\1\u008d",
+            "",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
+            "",
+            "",
+            "",
+            "\1\u008f\37\uffff\1\u008f",
             "\1\u0090\37\uffff\1\u0090",
+            "",
+            "",
+            "",
             "\1\u0091\37\uffff\1\u0091",
             "\1\u0092\37\uffff\1\u0092",
             "",
+            "\1\u0093\37\uffff\1\u0093",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
-            "\1\u0094\37\uffff\1\u0094",
+            "\1\u0095\37\uffff\1\u0095",
+            "\1\u0096\37\uffff\1\u0096",
+            "\1\u0097\37\uffff\1\u0097",
+            "",
+            "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
+            "\35",
+            "\1\u0099\37\uffff\1\u0099",
             "\2\35\13\uffff\13\35\6\uffff\32\35\4\uffff\1\35\1\uffff\32"+
             "\35",
             "",
@@ -3413,7 +3535,7 @@ public class CMISLexer extends Lexer {
             this.transition = DFA19_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( QUOTED_STRING | SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | LPAREN | RPAREN | STAR | COMMA | DOTSTAR | DOT | DOTDOT | EQUALS | TILDA | NOTEQUALS | GREATERTHAN | LESSTHAN | GREATERTHANOREQUALS | LESSTHANOREQUALS | COLON | DOUBLE_QUOTE | DECIMAL_INTEGER_LITERAL | FLOATING_POINT_LITERAL | ID | WS );";
+            return "1:1: Tokens : ( QUOTED_STRING | SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | SCORE | LPAREN | RPAREN | STAR | COMMA | DOTSTAR | DOT | DOTDOT | EQUALS | TILDA | NOTEQUALS | GREATERTHAN | LESSTHAN | GREATERTHANOREQUALS | LESSTHANOREQUALS | COLON | DOUBLE_QUOTE | DECIMAL_INTEGER_LITERAL | FLOATING_POINT_LITERAL | ID | WS );";
         }
     }
  
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
index c36635b578..b20e6a763d 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
@@ -1,5 +1,8 @@
-// $ANTLR !Unknown version! W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2009-10-13 15:31:44
-package org.alfresco.repo.search.impl.parsers;
+// $ANTLR !Unknown version! W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2009-10-15 15:44:00
+
+    package org.alfresco.repo.search.impl.parsers;
+    import org.alfresco.cmis.CMISQueryException;
+
 
 import org.antlr.runtime.*;
 import java.util.Stack;
@@ -12,11 +15,11 @@ import org.antlr.runtime.tree.*;
 
 public class CMISParser extends Parser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "QUERY", "ALL_COLUMNS", "COLUMN", "COLUMNS", "COLUMN_REF", "QUALIFIER", "FUNCTION", "SOURCE", "TABLE", "TABLE_REF", "PARAMETER", "CONJUNCTION", "DISJUNCTION", "NEGATION", "PRED_COMPARISON", "PRED_IN", "PRED_EXISTS", "PRED_LIKE", "PRED_FTS", "LIST", "PRED_CHILD", "PRED_DESCENDANT", "SORT_SPECIFICATION", "NUMERIC_LITERAL", "STRING_LITERAL", "DATETIME_LITERAL", "BOOLEAN_LITERAL", "SELECT", "STAR", "COMMA", "AS", "DOTSTAR", "DOT", "LPAREN", "RPAREN", "FROM", "JOIN", "INNER", "LEFT", "OUTER", "ON", "EQUALS", "WHERE", "OR", "AND", "NOT", "NOTEQUALS", "LESSTHAN", "GREATERTHAN", "LESSTHANOREQUALS", "GREATERTHANOREQUALS", "IN", "LIKE", "IS", "NULL", "ANY", "CONTAINS", "IN_FOLDER", "IN_TREE", "ORDER", "BY", "ASC", "DESC", "COLON", "QUOTED_STRING", "ID", "DOUBLE_QUOTE", "FLOATING_POINT_LITERAL", "DECIMAL_INTEGER_LITERAL", "TRUE", "FALSE", "TIMESTAMP", "DOTDOT", "TILDA", "PLUS", "MINUS", "DECIMAL_NUMERAL", "DIGIT", "EXPONENT", "WS", "ZERO_DIGIT", "NON_ZERO_DIGIT", "E", "SIGNED_INTEGER"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "QUERY", "ALL_COLUMNS", "COLUMN", "COLUMNS", "COLUMN_REF", "QUALIFIER", "FUNCTION", "SOURCE", "TABLE", "TABLE_REF", "PARAMETER", "CONJUNCTION", "DISJUNCTION", "NEGATION", "PRED_COMPARISON", "PRED_IN", "PRED_EXISTS", "PRED_LIKE", "PRED_FTS", "LIST", "PRED_CHILD", "PRED_DESCENDANT", "SORT_SPECIFICATION", "NUMERIC_LITERAL", "STRING_LITERAL", "DATETIME_LITERAL", "BOOLEAN_LITERAL", "SELECT", "STAR", "COMMA", "AS", "DOTSTAR", "DOT", "LPAREN", "RPAREN", "FROM", "JOIN", "INNER", "LEFT", "OUTER", "ON", "EQUALS", "WHERE", "OR", "AND", "NOT", "NOTEQUALS", "LESSTHAN", "GREATERTHAN", "LESSTHANOREQUALS", "GREATERTHANOREQUALS", "IN", "LIKE", "IS", "NULL", "ANY", "CONTAINS", "IN_FOLDER", "IN_TREE", "ORDER", "BY", "ASC", "DESC", "COLON", "QUOTED_STRING", "ID", "DOUBLE_QUOTE", "FLOATING_POINT_LITERAL", "DECIMAL_INTEGER_LITERAL", "TRUE", "FALSE", "TIMESTAMP", "SCORE", "DOTDOT", "TILDA", "PLUS", "MINUS", "DECIMAL_NUMERAL", "DIGIT", "EXPONENT", "WS", "ZERO_DIGIT", "NON_ZERO_DIGIT", "E", "SIGNED_INTEGER"
     };
     public static final int FUNCTION=10;
     public static final int WHERE=46;
-    public static final int EXPONENT=82;
+    public static final int EXPONENT=83;
     public static final int PRED_FTS=22;
     public static final int STAR=32;
     public static final int INNER=41;
@@ -27,7 +30,7 @@ public class CMISParser extends Parser {
     public static final int CONTAINS=60;
     public static final int TABLE=12;
     public static final int SOURCE=11;
-    public static final int DOTDOT=76;
+    public static final int DOTDOT=77;
     public static final int EQUALS=45;
     public static final int NOT=49;
     public static final int ID=69;
@@ -37,33 +40,33 @@ public class CMISParser extends Parser {
     public static final int LESSTHANOREQUALS=53;
     public static final int AS=34;
     public static final int RPAREN=38;
-    public static final int TILDA=77;
+    public static final int TILDA=78;
     public static final int PRED_LIKE=21;
     public static final int STRING_LITERAL=28;
     public static final int IN=55;
-    public static final int DECIMAL_NUMERAL=80;
+    public static final int DECIMAL_NUMERAL=81;
     public static final int FLOATING_POINT_LITERAL=71;
     public static final int COMMA=33;
     public static final int IS=57;
     public static final int LEFT=42;
-    public static final int SIGNED_INTEGER=87;
+    public static final int SIGNED_INTEGER=88;
     public static final int PARAMETER=14;
     public static final int COLUMN=6;
-    public static final int PLUS=78;
+    public static final int PLUS=79;
     public static final int QUOTED_STRING=68;
-    public static final int ZERO_DIGIT=84;
-    public static final int DIGIT=81;
+    public static final int ZERO_DIGIT=85;
+    public static final int DIGIT=82;
     public static final int DOT=36;
     public static final int COLUMN_REF=8;
     public static final int SELECT=31;
     public static final int LIKE=56;
     public static final int GREATERTHAN=52;
     public static final int DOTSTAR=35;
-    public static final int E=86;
+    public static final int E=87;
     public static final int OUTER=43;
     public static final int BY=64;
     public static final int LESSTHAN=51;
-    public static final int NON_ZERO_DIGIT=85;
+    public static final int NON_ZERO_DIGIT=86;
     public static final int ASC=65;
     public static final int QUALIFIER=9;
     public static final int CONJUNCTION=15;
@@ -71,7 +74,7 @@ public class CMISParser extends Parser {
     public static final int ON=44;
     public static final int NOTEQUALS=50;
     public static final int DATETIME_LITERAL=29;
-    public static final int MINUS=79;
+    public static final int MINUS=80;
     public static final int LIST=23;
     public static final int TRUE=73;
     public static final int PRED_DESCENDANT=25;
@@ -82,8 +85,9 @@ public class CMISParser extends Parser {
     public static final int BOOLEAN_LITERAL=30;
     public static final int DISJUNCTION=16;
     public static final int COLUMNS=7;
-    public static final int WS=83;
+    public static final int WS=84;
     public static final int ANY=59;
+    public static final int SCORE=76;
     public static final int NEGATION=17;
     public static final int TABLE_REF=13;
     public static final int SORT_SPECIFICATION=26;
@@ -127,60 +131,146 @@ public class CMISParser extends Parser {
 
         private Stack<String> paraphrases = new Stack<String>();
         
-        private boolean strict = true;
+        private boolean strict = false;
 
         /**
          * CMIS strict
          */
-    	public boolean strict()
-    	{
-    	   return strict;
-    	}
+        public boolean strict()
+        {
+            return strict;
+        }
     	
-    	public void setStrict(boolean strict)
-      {
-         this.strict = strict;
-      }
+        public void setStrict(boolean strict)
+        {
+            this.strict = strict;
+        }
+            
+        protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException
+        {
+            throw new MismatchedTokenException(ttype, input);
+        }
     	
-    	protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException
-    	{
-    	   throw new MismatchedTokenException(ttype, input);
-    	}
+        public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
+        {
+            throw e;
+        }
     	
-    	public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
-    	{
-    	   throw e;
-    	}
+        public String getErrorMessage(RecognitionException e, String[] tokenNames) 
+        {
+            List stack = getRuleInvocationStack(e, this.getClass().getName());
+            String msg = e.getMessage();
+            if ( e instanceof UnwantedTokenException ) 
+    	    {
+                UnwantedTokenException ute = (UnwantedTokenException)e;
+                String tokenName="<unknown>";
+                if ( ute.expecting== Token.EOF ) 
+                {
+                    tokenName = "EOF";
+                }
+                else 
+                {
+                    tokenName = tokenNames[ute.expecting];
+                }
+                msg = "extraneous input " + getTokenErrorDisplay(ute.getUnexpectedToken())
+                    + " expecting "+tokenName;
+            }
+            else if ( e instanceof MissingTokenException ) 
+            {
+                MissingTokenException mte = (MissingTokenException)e;
+                String tokenName="<unknown>";
+                if ( mte.expecting== Token.EOF ) 
+                {
+                    tokenName = "EOF";
+                }
+                else 
+                {
+                    tokenName = tokenNames[mte.expecting];
+                }
+                msg = "missing " + tokenName+" at " + getTokenErrorDisplay(e.token)
+                    + "  (" + getLongTokenErrorDisplay(e.token) +")";
+            }
+            else if ( e instanceof MismatchedTokenException ) 
+            {
+                MismatchedTokenException mte = (MismatchedTokenException)e;
+                String tokenName="<unknown>";
+                if ( mte.expecting== Token.EOF ) 
+                {
+                    tokenName = "EOF";
+                }
+                else
+                {
+                    tokenName = tokenNames[mte.expecting];
+                }
+                msg = "mismatched input " + getTokenErrorDisplay(e.token)
+                    + " expecting " + tokenName +"  (" + getLongTokenErrorDisplay(e.token) + ")";
+            }
+            else if ( e instanceof MismatchedTreeNodeException ) 
+            {
+                MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
+                String tokenName="<unknown>";
+                if ( mtne.expecting==Token.EOF )  
+                {
+                    tokenName = "EOF";
+                }
+                else 
+                {
+                    tokenName = tokenNames[mtne.expecting];
+                }
+                msg = "mismatched tree node: " + mtne.node + " expecting " + tokenName;
+            }
+            else if ( e instanceof NoViableAltException ) 
+            {
+                NoViableAltException nvae = (NoViableAltException)e;
+                msg = "no viable alternative at input " + getTokenErrorDisplay(e.token)
+                    + "\n\t (decision=" + nvae.decisionNumber
+                    + " state " + nvae.stateNumber + ")" 
+                    + " decision=<<" + nvae.grammarDecisionDescription + ">>";
+            }
+            else if ( e instanceof EarlyExitException ) 
+            {
+                //EarlyExitException eee = (EarlyExitException)e;
+                // for development, can add "(decision="+eee.decisionNumber+")"
+                msg = "required (...)+ loop did not match anything at input " + getTokenErrorDisplay(e.token);
+            }
+    	    else if ( e instanceof MismatchedSetException ) 
+    	    {
+    	        MismatchedSetException mse = (MismatchedSetException)e;
+    	        msg = "mismatched input " + getTokenErrorDisplay(e.token)
+                    + " expecting set " + mse.expecting;
+            }
+            else if ( e instanceof MismatchedNotSetException ) 
+            {
+                MismatchedNotSetException mse = (MismatchedNotSetException)e;
+                msg = "mismatched input " + getTokenErrorDisplay(e.token)
+                    + " expecting set " + mse.expecting;
+            }
+            else if ( e instanceof FailedPredicateException ) 
+            {
+                FailedPredicateException fpe = (FailedPredicateException)e;
+                msg = "rule " + fpe.ruleName + " failed predicate: {" + fpe.predicateText + "}?";
+            }
+    		
+            if(paraphrases.size() > 0)
+            {
+                String paraphrase = (String)paraphrases.peek();
+                msg = msg+" "+paraphrase;
+            }
+            return msg +"\n\t"+stack;
+        }
     	
-    	public String getErrorMessage(RecognitionException e, String[] tokenNames)
-    	{
-           List stack = getRuleInvocationStack(e, this.getClass().getName());
-    	   String msg = null;
-    	   if(e instanceof NoViableAltException)
-    	   {
-    	        NoViableAltException nvae = (NoViableAltException)e;
-    	        msg = "No viable alt; token="+e.token+
-    	         " (decision="+nvae.decisionNumber+
-    	         " state "+nvae.stateNumber+")"+
-    	         " decision=<<"+nvae.grammarDecisionDescription+">>";
-    	   }
-    	   else
-    	   {
-    	       msg = super.getErrorMessage(e, tokenNames);
-    	   }
-    	   if(paraphrases.size() > 0)
-    	   {
-    	       String paraphrase = (String)paraphrases.peek();
-    	       msg = msg+" "+paraphrase;
-    	   }
-    	   
-    	   return stack+" "+msg;
-    	}
-    	
-    	public String getTokenErrorDisplay(Token t)
-    	{
-    	   return t.toString();
-    	}
+        public String getLongTokenErrorDisplay(Token t)
+        {
+            return t.toString();
+        }
+        
+
+        public String getErrorString(RecognitionException e)
+        {
+            String hdr = getErrorHeader(e);
+            String msg = getErrorMessage(e, this.getTokenNames());
+            return hdr+" "+msg;
+        }
 
 
     public static class query_return extends ParserRuleReturnScope {
@@ -189,7 +279,7 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "query"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:151:1: query : SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:289:1: query : SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) ;
     public final CMISParser.query_return query() throws RecognitionException {
         CMISParser.query_return retval = new CMISParser.query_return();
         retval.start = input.LT(1);
@@ -215,26 +305,27 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_orderByClause=new RewriteRuleSubtreeStream(adaptor,"rule orderByClause");
         RewriteRuleSubtreeStream stream_selectList=new RewriteRuleSubtreeStream(adaptor,"rule selectList");
         RewriteRuleSubtreeStream stream_fromClause=new RewriteRuleSubtreeStream(adaptor,"rule fromClause");
+            paraphrases.push("in query"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:158:2: ( SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:158:4: SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:298:2: ( SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:298:4: SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF
             {
-            SELECT1=(Token)match(input,SELECT,FOLLOW_SELECT_in_query180); if (state.failed) return retval; 
+            SELECT1=(Token)match(input,SELECT,FOLLOW_SELECT_in_query217); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_SELECT.add(SELECT1);
 
-            pushFollow(FOLLOW_selectList_in_query182);
+            pushFollow(FOLLOW_selectList_in_query219);
             selectList2=selectList();
 
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_selectList.add(selectList2.getTree());
-            pushFollow(FOLLOW_fromClause_in_query184);
+            pushFollow(FOLLOW_fromClause_in_query221);
             fromClause3=fromClause();
 
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_fromClause.add(fromClause3.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:158:33: ( whereClause )?
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:298:33: ( whereClause )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -243,9 +334,9 @@ public class CMISParser extends Parser {
             }
             switch (alt1) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:158:33: whereClause
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:298:33: whereClause
                     {
-                    pushFollow(FOLLOW_whereClause_in_query186);
+                    pushFollow(FOLLOW_whereClause_in_query223);
                     whereClause4=whereClause();
 
                     state._fsp--;
@@ -257,7 +348,7 @@ public class CMISParser extends Parser {
 
             }
 
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:158:46: ( orderByClause )?
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:298:46: ( orderByClause )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -266,9 +357,9 @@ public class CMISParser extends Parser {
             }
             switch (alt2) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:158:46: orderByClause
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:298:46: orderByClause
                     {
-                    pushFollow(FOLLOW_orderByClause_in_query189);
+                    pushFollow(FOLLOW_orderByClause_in_query226);
                     orderByClause5=orderByClause();
 
                     state._fsp--;
@@ -280,13 +371,13 @@ public class CMISParser extends Parser {
 
             }
 
-            EOF6=(Token)match(input,EOF,FOLLOW_EOF_in_query192); if (state.failed) return retval; 
+            EOF6=(Token)match(input,EOF,FOLLOW_EOF_in_query229); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_EOF.add(EOF6);
 
 
 
             // AST REWRITE
-            // elements: selectList, whereClause, fromClause, orderByClause
+            // elements: selectList, orderByClause, fromClause, whereClause
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -297,22 +388,22 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 159:3: -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? )
+            // 299:3: -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:159:6: ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:299:6: ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(QUERY, "QUERY"), root_1);
 
                 adaptor.addChild(root_1, stream_selectList.nextTree());
                 adaptor.addChild(root_1, stream_fromClause.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:159:36: ( whereClause )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:299:36: ( whereClause )?
                 if ( stream_whereClause.hasNext() ) {
                     adaptor.addChild(root_1, stream_whereClause.nextTree());
 
                 }
                 stream_whereClause.reset();
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:159:49: ( orderByClause )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:299:49: ( orderByClause )?
                 if ( stream_orderByClause.hasNext() ) {
                     adaptor.addChild(root_1, stream_orderByClause.nextTree());
 
@@ -334,12 +425,15 @@ public class CMISParser extends Parser {
             retval.tree = (Object)adaptor.rulePostProcessing(root_0);
             adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( state.backtracking==0 ) {
+                  paraphrases.pop(); 
+            }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -352,7 +446,7 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "selectList"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:163:1: selectList : ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:303:1: selectList : ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) );
     public final CMISParser.selectList_return selectList() throws RecognitionException {
         CMISParser.selectList_return retval = new CMISParser.selectList_return();
         retval.start = input.LT(1);
@@ -373,7 +467,7 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_selectSubList=new RewriteRuleSubtreeStream(adaptor,"rule selectSubList");
             paraphrases.push("in select list"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:166:2: ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:306:2: ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -386,7 +480,10 @@ public class CMISParser extends Parser {
             else if ( (LA4_0==DOUBLE_QUOTE) && ((strict == false))) {
                 alt4=2;
             }
-            else if ( (LA4_0==SELECT||LA4_0==AS||(LA4_0>=FROM && LA4_0<=ON)||(LA4_0>=WHERE && LA4_0<=NOT)||(LA4_0>=IN && LA4_0<=DESC)||(LA4_0>=TRUE && LA4_0<=TIMESTAMP)) ) {
+            else if ( (LA4_0==SCORE) ) {
+                alt4=2;
+            }
+            else if ( (LA4_0==SELECT||LA4_0==AS||(LA4_0>=FROM && LA4_0<=ON)||(LA4_0>=WHERE && LA4_0<=NOT)||(LA4_0>=IN && LA4_0<=DESC)||(LA4_0>=TRUE && LA4_0<=TIMESTAMP)) && ((strict == false))) {
                 alt4=2;
             }
             else {
@@ -398,9 +495,9 @@ public class CMISParser extends Parser {
             }
             switch (alt4) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:166:4: STAR
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:306:4: STAR
                     {
-                    STAR7=(Token)match(input,STAR,FOLLOW_STAR_in_selectList241); if (state.failed) return retval; 
+                    STAR7=(Token)match(input,STAR,FOLLOW_STAR_in_selectList286); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_STAR.add(STAR7);
 
 
@@ -417,9 +514,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 167:3: -> ^( ALL_COLUMNS )
+                    // 307:3: -> ^( ALL_COLUMNS )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:167:6: ^( ALL_COLUMNS )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:307:6: ^( ALL_COLUMNS )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(ALL_COLUMNS, "ALL_COLUMNS"), root_1);
@@ -433,15 +530,15 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:168:5: selectSubList ( COMMA selectSubList )*
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:308:5: selectSubList ( COMMA selectSubList )*
                     {
-                    pushFollow(FOLLOW_selectSubList_in_selectList257);
+                    pushFollow(FOLLOW_selectSubList_in_selectList302);
                     selectSubList8=selectSubList();
 
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_selectSubList.add(selectSubList8.getTree());
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:168:19: ( COMMA selectSubList )*
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:308:19: ( COMMA selectSubList )*
                     loop3:
                     do {
                         int alt3=2;
@@ -454,12 +551,12 @@ public class CMISParser extends Parser {
 
                         switch (alt3) {
                     	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:168:21: COMMA selectSubList
+                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:308:21: COMMA selectSubList
                     	    {
-                    	    COMMA9=(Token)match(input,COMMA,FOLLOW_COMMA_in_selectList261); if (state.failed) return retval; 
+                    	    COMMA9=(Token)match(input,COMMA,FOLLOW_COMMA_in_selectList306); if (state.failed) return retval; 
                     	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA9);
 
-                    	    pushFollow(FOLLOW_selectSubList_in_selectList263);
+                    	    pushFollow(FOLLOW_selectSubList_in_selectList308);
                     	    selectSubList10=selectSubList();
 
                     	    state._fsp--;
@@ -488,9 +585,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 169:3: -> ^( COLUMNS ( selectSubList )+ )
+                    // 309:3: -> ^( COLUMNS ( selectSubList )+ )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:169:6: ^( COLUMNS ( selectSubList )+ )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:309:6: ^( COLUMNS ( selectSubList )+ )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMNS, "COLUMNS"), root_1);
@@ -526,10 +623,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -542,7 +639,7 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "selectSubList"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:173:1: selectSubList : ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->);
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313:1: selectSubList : ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->);
     public final CMISParser.selectSubList_return selectSubList() throws RecognitionException {
         CMISParser.selectSubList_return retval = new CMISParser.selectSubList_return();
         retval.start = input.LT(1);
@@ -569,20 +666,20 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:2: ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->)
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:2: ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->)
             int alt7=3;
             alt7 = dfa7.predict(input);
             switch (alt7) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:4: ( valueExpression )=> valueExpression ( ( AS )? columnName )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:4: ( valueExpression )=> valueExpression ( ( AS )? columnName )?
                     {
-                    pushFollow(FOLLOW_valueExpression_in_selectSubList299);
+                    pushFollow(FOLLOW_valueExpression_in_selectSubList344);
                     valueExpression11=valueExpression();
 
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_valueExpression.add(valueExpression11.getTree());
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:40: ( ( AS )? columnName )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:40: ( ( AS )? columnName )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -594,9 +691,9 @@ public class CMISParser extends Parser {
                     }
                     switch (alt6) {
                         case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:42: ( AS )? columnName
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:42: ( AS )? columnName
                             {
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:42: ( AS )?
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:42: ( AS )?
                             int alt5=2;
                             int LA5_0 = input.LA(1);
 
@@ -605,9 +702,9 @@ public class CMISParser extends Parser {
                             }
                             switch (alt5) {
                                 case 1 :
-                                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:42: AS
+                                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:42: AS
                                     {
-                                    AS12=(Token)match(input,AS,FOLLOW_AS_in_selectSubList303); if (state.failed) return retval; 
+                                    AS12=(Token)match(input,AS,FOLLOW_AS_in_selectSubList348); if (state.failed) return retval; 
                                     if ( state.backtracking==0 ) stream_AS.add(AS12);
 
 
@@ -616,7 +713,7 @@ public class CMISParser extends Parser {
 
                             }
 
-                            pushFollow(FOLLOW_columnName_in_selectSubList306);
+                            pushFollow(FOLLOW_columnName_in_selectSubList351);
                             columnName13=columnName();
 
                             state._fsp--;
@@ -642,15 +739,15 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 175:3: -> ^( COLUMN valueExpression ( columnName )? )
+                    // 315:3: -> ^( COLUMN valueExpression ( columnName )? )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:175:6: ^( COLUMN valueExpression ( columnName )? )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:315:6: ^( COLUMN valueExpression ( columnName )? )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMN, "COLUMN"), root_1);
 
                         adaptor.addChild(root_1, stream_valueExpression.nextTree());
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:175:31: ( columnName )?
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:315:31: ( columnName )?
                         if ( stream_columnName.hasNext() ) {
                             adaptor.addChild(root_1, stream_columnName.nextTree());
 
@@ -666,15 +763,15 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:176:4: qualifier DOTSTAR
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:316:4: qualifier DOTSTAR
                     {
-                    pushFollow(FOLLOW_qualifier_in_selectSubList327);
+                    pushFollow(FOLLOW_qualifier_in_selectSubList372);
                     qualifier14=qualifier();
 
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_qualifier.add(qualifier14.getTree());
-                    DOTSTAR15=(Token)match(input,DOTSTAR,FOLLOW_DOTSTAR_in_selectSubList329); if (state.failed) return retval; 
+                    DOTSTAR15=(Token)match(input,DOTSTAR,FOLLOW_DOTSTAR_in_selectSubList374); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_DOTSTAR.add(DOTSTAR15);
 
 
@@ -691,9 +788,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 177:3: -> ^( ALL_COLUMNS qualifier )
+                    // 317:3: -> ^( ALL_COLUMNS qualifier )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:177:6: ^( ALL_COLUMNS qualifier )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:317:6: ^( ALL_COLUMNS qualifier )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(ALL_COLUMNS, "ALL_COLUMNS"), root_1);
@@ -709,9 +806,9 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:178:4: multiValuedColumnReference
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:318:4: multiValuedColumnReference
                     {
-                    pushFollow(FOLLOW_multiValuedColumnReference_in_selectSubList345);
+                    pushFollow(FOLLOW_multiValuedColumnReference_in_selectSubList390);
                     multiValuedColumnReference16=multiValuedColumnReference();
 
                     state._fsp--;
@@ -731,7 +828,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 179:3: ->
+                    // 319:3: ->
                     {
                         root_0 = null;
                     }
@@ -750,10 +847,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -766,7 +863,7 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "valueExpression"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:182:1: valueExpression : ( columnReference -> columnReference | valueFunction -> valueFunction );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:322:1: valueExpression : ( columnReference -> columnReference | valueFunction -> valueFunction );
     public final CMISParser.valueExpression_return valueExpression() throws RecognitionException {
         CMISParser.valueExpression_return retval = new CMISParser.valueExpression_return();
         retval.start = input.LT(1);
@@ -780,8 +877,9 @@ public class CMISParser extends Parser {
 
         RewriteRuleSubtreeStream stream_valueFunction=new RewriteRuleSubtreeStream(adaptor,"rule valueFunction");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
+            paraphrases.push("in value expression"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:183:2: ( columnReference -> columnReference | valueFunction -> valueFunction )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:325:2: ( columnReference -> columnReference | valueFunction -> valueFunction )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -791,7 +889,7 @@ public class CMISParser extends Parser {
                 if ( (LA8_1==EOF||(LA8_1>=COMMA && LA8_1<=AS)||LA8_1==DOT||LA8_1==FROM||LA8_1==EQUALS||(LA8_1>=NOTEQUALS && LA8_1<=GREATERTHANOREQUALS)||(LA8_1>=ID && LA8_1<=DOUBLE_QUOTE)) ) {
                     alt8=1;
                 }
-                else if ( (LA8_1==LPAREN) ) {
+                else if ( (LA8_1==LPAREN) && ((strict == false))) {
                     alt8=2;
                 }
                 else {
@@ -805,7 +903,10 @@ public class CMISParser extends Parser {
             else if ( (LA8_0==DOUBLE_QUOTE) && ((strict == false))) {
                 alt8=1;
             }
-            else if ( (LA8_0==SELECT||LA8_0==AS||(LA8_0>=FROM && LA8_0<=ON)||(LA8_0>=WHERE && LA8_0<=NOT)||(LA8_0>=IN && LA8_0<=DESC)||(LA8_0>=TRUE && LA8_0<=TIMESTAMP)) ) {
+            else if ( (LA8_0==SCORE) ) {
+                alt8=2;
+            }
+            else if ( (LA8_0==SELECT||LA8_0==AS||(LA8_0>=FROM && LA8_0<=ON)||(LA8_0>=WHERE && LA8_0<=NOT)||(LA8_0>=IN && LA8_0<=DESC)||(LA8_0>=TRUE && LA8_0<=TIMESTAMP)) && ((strict == false))) {
                 alt8=2;
             }
             else {
@@ -817,9 +918,9 @@ public class CMISParser extends Parser {
             }
             switch (alt8) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:183:4: columnReference
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:325:4: columnReference
                     {
-                    pushFollow(FOLLOW_columnReference_in_valueExpression364);
+                    pushFollow(FOLLOW_columnReference_in_valueExpression435);
                     columnReference17=columnReference();
 
                     state._fsp--;
@@ -839,7 +940,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 184:3: -> columnReference
+                    // 326:3: -> columnReference
                     {
                         adaptor.addChild(root_0, stream_columnReference.nextTree());
 
@@ -849,9 +950,9 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:185:5: valueFunction
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:327:5: valueFunction
                     {
-                    pushFollow(FOLLOW_valueFunction_in_valueExpression377);
+                    pushFollow(FOLLOW_valueFunction_in_valueExpression448);
                     valueFunction18=valueFunction();
 
                     state._fsp--;
@@ -871,7 +972,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 186:3: -> valueFunction
+                    // 328:3: -> valueFunction
                     {
                         adaptor.addChild(root_0, stream_valueFunction.nextTree());
 
@@ -889,12 +990,15 @@ public class CMISParser extends Parser {
             retval.tree = (Object)adaptor.rulePostProcessing(root_0);
             adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( state.backtracking==0 ) {
+                  paraphrases.pop(); 
+            }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -907,7 +1011,7 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "columnReference"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:189:1: columnReference : ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:331:1: columnReference : ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) ;
     public final CMISParser.columnReference_return columnReference() throws RecognitionException {
         CMISParser.columnReference_return retval = new CMISParser.columnReference_return();
         retval.start = input.LT(1);
@@ -924,24 +1028,25 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
+            paraphrases.push("in column reference"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:190:2: ( ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:190:4: ( qualifier DOT )? columnName
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:334:2: ( ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:334:4: ( qualifier DOT )? columnName
             {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:190:4: ( qualifier DOT )?
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:334:4: ( qualifier DOT )?
             int alt9=2;
             alt9 = dfa9.predict(input);
             switch (alt9) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:190:6: qualifier DOT
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:334:6: qualifier DOT
                     {
-                    pushFollow(FOLLOW_qualifier_in_columnReference400);
+                    pushFollow(FOLLOW_qualifier_in_columnReference497);
                     qualifier19=qualifier();
 
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_qualifier.add(qualifier19.getTree());
-                    DOT20=(Token)match(input,DOT,FOLLOW_DOT_in_columnReference402); if (state.failed) return retval; 
+                    DOT20=(Token)match(input,DOT,FOLLOW_DOT_in_columnReference499); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_DOT.add(DOT20);
 
 
@@ -950,7 +1055,7 @@ public class CMISParser extends Parser {
 
             }
 
-            pushFollow(FOLLOW_columnName_in_columnReference407);
+            pushFollow(FOLLOW_columnName_in_columnReference504);
             columnName21=columnName();
 
             state._fsp--;
@@ -959,7 +1064,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: qualifier, columnName
+            // elements: columnName, qualifier
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -970,15 +1075,15 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 191:3: -> ^( COLUMN_REF columnName ( qualifier )? )
+            // 335:3: -> ^( COLUMN_REF columnName ( qualifier )? )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:191:6: ^( COLUMN_REF columnName ( qualifier )? )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:335:6: ^( COLUMN_REF columnName ( qualifier )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMN_REF, "COLUMN_REF"), root_1);
 
                 adaptor.addChild(root_1, stream_columnName.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:191:30: ( qualifier )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:335:30: ( qualifier )?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_1, stream_qualifier.nextTree());
 
@@ -1000,12 +1105,15 @@ public class CMISParser extends Parser {
             retval.tree = (Object)adaptor.rulePostProcessing(root_0);
             adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( state.backtracking==0 ) {
+                  paraphrases.pop(); 
+            }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -1018,7 +1126,7 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "multiValuedColumnReference"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:198:1: multiValuedColumnReference : ( qualifier DOT )? multiValuedColumnName -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:342:1: multiValuedColumnReference : ( qualifier DOT )? multiValuedColumnName -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? ) ;
     public final CMISParser.multiValuedColumnReference_return multiValuedColumnReference() throws RecognitionException {
         CMISParser.multiValuedColumnReference_return retval = new CMISParser.multiValuedColumnReference_return();
         retval.start = input.LT(1);
@@ -1035,24 +1143,25 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         RewriteRuleSubtreeStream stream_multiValuedColumnName=new RewriteRuleSubtreeStream(adaptor,"rule multiValuedColumnName");
+            paraphrases.push("in column reference"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:199:2: ( ( qualifier DOT )? multiValuedColumnName -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:199:10: ( qualifier DOT )? multiValuedColumnName
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:345:2: ( ( qualifier DOT )? multiValuedColumnName -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:345:10: ( qualifier DOT )? multiValuedColumnName
             {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:199:10: ( qualifier DOT )?
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:345:10: ( qualifier DOT )?
             int alt10=2;
             alt10 = dfa10.predict(input);
             switch (alt10) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:199:12: qualifier DOT
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:345:12: qualifier DOT
                     {
-                    pushFollow(FOLLOW_qualifier_in_multiValuedColumnReference443);
+                    pushFollow(FOLLOW_qualifier_in_multiValuedColumnReference566);
                     qualifier22=qualifier();
 
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_qualifier.add(qualifier22.getTree());
-                    DOT23=(Token)match(input,DOT,FOLLOW_DOT_in_multiValuedColumnReference445); if (state.failed) return retval; 
+                    DOT23=(Token)match(input,DOT,FOLLOW_DOT_in_multiValuedColumnReference568); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_DOT.add(DOT23);
 
 
@@ -1061,7 +1170,7 @@ public class CMISParser extends Parser {
 
             }
 
-            pushFollow(FOLLOW_multiValuedColumnName_in_multiValuedColumnReference451);
+            pushFollow(FOLLOW_multiValuedColumnName_in_multiValuedColumnReference574);
             multiValuedColumnName24=multiValuedColumnName();
 
             state._fsp--;
@@ -1081,15 +1190,15 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 200:3: -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? )
+            // 346:3: -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:200:6: ^( COLUMN_REF multiValuedColumnName ( qualifier )? )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:346:6: ^( COLUMN_REF multiValuedColumnName ( qualifier )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMN_REF, "COLUMN_REF"), root_1);
 
                 adaptor.addChild(root_1, stream_multiValuedColumnName.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:200:41: ( qualifier )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:346:41: ( qualifier )?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_1, stream_qualifier.nextTree());
 
@@ -1111,12 +1220,15 @@ public class CMISParser extends Parser {
             retval.tree = (Object)adaptor.rulePostProcessing(root_0);
             adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( state.backtracking==0 ) {
+                  paraphrases.pop(); 
+            }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -1129,7 +1241,7 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "valueFunction"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:203:1: valueFunction : functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:349:1: valueFunction : (cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN ) | {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) );
     public final CMISParser.valueFunction_return valueFunction() throws RecognitionException {
         CMISParser.valueFunction_return retval = new CMISParser.valueFunction_return();
         retval.start = input.LT(1);
@@ -1138,112 +1250,226 @@ public class CMISParser extends Parser {
 
         Token LPAREN25=null;
         Token RPAREN27=null;
+        Token LPAREN28=null;
+        Token RPAREN30=null;
+        CMISParser.cmisFunction_return cmisFunctionName = null;
+
         CMISParser.keyWordOrId_return functionName = null;
 
         CMISParser.functionArgument_return functionArgument26 = null;
 
+        CMISParser.functionArgument_return functionArgument29 = null;
+
 
         Object LPAREN25_tree=null;
         Object RPAREN27_tree=null;
+        Object LPAREN28_tree=null;
+        Object RPAREN30_tree=null;
         RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
         RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
+        RewriteRuleSubtreeStream stream_cmisFunction=new RewriteRuleSubtreeStream(adaptor,"rule cmisFunction");
         RewriteRuleSubtreeStream stream_keyWordOrId=new RewriteRuleSubtreeStream(adaptor,"rule keyWordOrId");
         RewriteRuleSubtreeStream stream_functionArgument=new RewriteRuleSubtreeStream(adaptor,"rule functionArgument");
+            paraphrases.push("in function"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:204:2: (functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:204:4: functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN
-            {
-            pushFollow(FOLLOW_keyWordOrId_in_valueFunction478);
-            functionName=keyWordOrId();
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352:9: (cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN ) | {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) )
+            int alt13=2;
+            alt13 = dfa13.predict(input);
+            switch (alt13) {
+                case 1 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352:17: cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN
+                    {
+                    pushFollow(FOLLOW_cmisFunction_in_valueFunction640);
+                    cmisFunctionName=cmisFunction();
 
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_keyWordOrId.add(functionName.getTree());
-            LPAREN25=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_valueFunction480); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN25);
+                    state._fsp--;
+                    if (state.failed) return retval;
+                    if ( state.backtracking==0 ) stream_cmisFunction.add(cmisFunctionName.getTree());
+                    LPAREN25=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_valueFunction642); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN25);
 
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:204:36: ( functionArgument )*
-            loop11:
-            do {
-                int alt11=2;
-                int LA11_0 = input.LA(1);
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352:54: ( functionArgument )*
+                    loop11:
+                    do {
+                        int alt11=2;
+                        int LA11_0 = input.LA(1);
 
-                if ( (LA11_0==ID) ) {
-                    alt11=1;
-                }
-                else if ( (LA11_0==DOUBLE_QUOTE) && ((strict == false))) {
-                    alt11=1;
-                }
-                else if ( (LA11_0==QUOTED_STRING||(LA11_0>=FLOATING_POINT_LITERAL && LA11_0<=TIMESTAMP)) ) {
-                    alt11=1;
-                }
-                else if ( (LA11_0==COLON) && ((strict == false))) {
-                    alt11=1;
-                }
+                        if ( (LA11_0==ID) ) {
+                            alt11=1;
+                        }
+                        else if ( (LA11_0==DOUBLE_QUOTE) && ((strict == false))) {
+                            alt11=1;
+                        }
+                        else if ( (LA11_0==QUOTED_STRING||(LA11_0>=FLOATING_POINT_LITERAL && LA11_0<=TIMESTAMP)) ) {
+                            alt11=1;
+                        }
+                        else if ( (LA11_0==COLON) && ((strict == false))) {
+                            alt11=1;
+                        }
 
 
-                switch (alt11) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:204:36: functionArgument
-            	    {
-            	    pushFollow(FOLLOW_functionArgument_in_valueFunction482);
-            	    functionArgument26=functionArgument();
+                        switch (alt11) {
+                    	case 1 :
+                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352:54: functionArgument
+                    	    {
+                    	    pushFollow(FOLLOW_functionArgument_in_valueFunction644);
+                    	    functionArgument26=functionArgument();
 
-            	    state._fsp--;
-            	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_functionArgument.add(functionArgument26.getTree());
+                    	    state._fsp--;
+                    	    if (state.failed) return retval;
+                    	    if ( state.backtracking==0 ) stream_functionArgument.add(functionArgument26.getTree());
 
-            	    }
-            	    break;
+                    	    }
+                    	    break;
 
-            	default :
-            	    break loop11;
-                }
-            } while (true);
+                    	default :
+                    	    break loop11;
+                        }
+                    } while (true);
 
-            RPAREN27=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_valueFunction485); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN27);
+                    RPAREN27=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_valueFunction647); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN27);
 
 
 
-            // AST REWRITE
-            // elements: RPAREN, functionArgument, LPAREN, functionName
-            // token labels: 
-            // rule labels: retval, functionName
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-            RewriteRuleSubtreeStream stream_functionName=new RewriteRuleSubtreeStream(adaptor,"rule functionName",functionName!=null?functionName.tree:null);
+                    // AST REWRITE
+                    // elements: cmisFunctionName, functionArgument, LPAREN, RPAREN
+                    // token labels: 
+                    // rule labels: retval, cmisFunctionName
+                    // token list labels: 
+                    // rule list labels: 
+                    // wildcard labels: 
+                    if ( state.backtracking==0 ) {
+                    retval.tree = root_0;
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_cmisFunctionName=new RewriteRuleSubtreeStream(adaptor,"rule cmisFunctionName",cmisFunctionName!=null?cmisFunctionName.tree:null);
 
-            root_0 = (Object)adaptor.nil();
-            // 205:3: -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:205:6: ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FUNCTION, "FUNCTION"), root_1);
+                    root_0 = (Object)adaptor.nil();
+                    // 353:3: -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN )
+                    {
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:6: ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN )
+                        {
+                        Object root_1 = (Object)adaptor.nil();
+                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FUNCTION, "FUNCTION"), root_1);
 
-                adaptor.addChild(root_1, stream_functionName.nextTree());
-                adaptor.addChild(root_1, stream_LPAREN.nextNode());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:205:38: ( functionArgument )*
-                while ( stream_functionArgument.hasNext() ) {
-                    adaptor.addChild(root_1, stream_functionArgument.nextTree());
+                        adaptor.addChild(root_1, stream_cmisFunctionName.nextTree());
+                        adaptor.addChild(root_1, stream_LPAREN.nextNode());
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:42: ( functionArgument )*
+                        while ( stream_functionArgument.hasNext() ) {
+                            adaptor.addChild(root_1, stream_functionArgument.nextTree());
 
-                }
-                stream_functionArgument.reset();
-                adaptor.addChild(root_1, stream_RPAREN.nextNode());
+                        }
+                        stream_functionArgument.reset();
+                        adaptor.addChild(root_1, stream_RPAREN.nextNode());
 
-                adaptor.addChild(root_0, root_1);
-                }
+                        adaptor.addChild(root_0, root_1);
+                        }
+
+                    }
+
+                    retval.tree = root_0;}
+                    }
+                    break;
+                case 2 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:4: {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN
+                    {
+                    if ( !((strict == false)) ) {
+                        if (state.backtracking>0) {state.failed=true; return retval;}
+                        throw new FailedPredicateException(input, "valueFunction", "strict == false");
+                    }
+                    pushFollow(FOLLOW_keyWordOrId_in_valueFunction675);
+                    functionName=keyWordOrId();
+
+                    state._fsp--;
+                    if (state.failed) return retval;
+                    if ( state.backtracking==0 ) stream_keyWordOrId.add(functionName.getTree());
+                    LPAREN28=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_valueFunction677); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN28);
+
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:57: ( functionArgument )*
+                    loop12:
+                    do {
+                        int alt12=2;
+                        int LA12_0 = input.LA(1);
+
+                        if ( (LA12_0==ID) ) {
+                            alt12=1;
+                        }
+                        else if ( (LA12_0==DOUBLE_QUOTE) && ((strict == false))) {
+                            alt12=1;
+                        }
+                        else if ( (LA12_0==QUOTED_STRING||(LA12_0>=FLOATING_POINT_LITERAL && LA12_0<=TIMESTAMP)) ) {
+                            alt12=1;
+                        }
+                        else if ( (LA12_0==COLON) && ((strict == false))) {
+                            alt12=1;
+                        }
+
+
+                        switch (alt12) {
+                    	case 1 :
+                    	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:57: functionArgument
+                    	    {
+                    	    pushFollow(FOLLOW_functionArgument_in_valueFunction679);
+                    	    functionArgument29=functionArgument();
+
+                    	    state._fsp--;
+                    	    if (state.failed) return retval;
+                    	    if ( state.backtracking==0 ) stream_functionArgument.add(functionArgument29.getTree());
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop12;
+                        }
+                    } while (true);
+
+                    RPAREN30=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_valueFunction682); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN30);
+
+
+
+                    // AST REWRITE
+                    // elements: RPAREN, LPAREN, functionName, functionArgument
+                    // token labels: 
+                    // rule labels: retval, functionName
+                    // token list labels: 
+                    // rule list labels: 
+                    // wildcard labels: 
+                    if ( state.backtracking==0 ) {
+                    retval.tree = root_0;
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_functionName=new RewriteRuleSubtreeStream(adaptor,"rule functionName",functionName!=null?functionName.tree:null);
+
+                    root_0 = (Object)adaptor.nil();
+                    // 355:3: -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN )
+                    {
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:355:6: ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN )
+                        {
+                        Object root_1 = (Object)adaptor.nil();
+                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FUNCTION, "FUNCTION"), root_1);
+
+                        adaptor.addChild(root_1, stream_functionName.nextTree());
+                        adaptor.addChild(root_1, stream_LPAREN.nextNode());
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:355:38: ( functionArgument )*
+                        while ( stream_functionArgument.hasNext() ) {
+                            adaptor.addChild(root_1, stream_functionArgument.nextTree());
+
+                        }
+                        stream_functionArgument.reset();
+                        adaptor.addChild(root_1, stream_RPAREN.nextNode());
+
+                        adaptor.addChild(root_0, root_1);
+                        }
+
+                    }
+
+                    retval.tree = root_0;}
+                    }
+                    break;
 
             }
-
-            retval.tree = root_0;}
-            }
-
             retval.stop = input.LT(-1);
 
             if ( state.backtracking==0 ) {
@@ -1251,12 +1477,15 @@ public class CMISParser extends Parser {
             retval.tree = (Object)adaptor.rulePostProcessing(root_0);
             adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( state.backtracking==0 ) {
+                  paraphrases.pop(); 
+            }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -1269,54 +1498,54 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "functionArgument"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:208:1: functionArgument : ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:358:1: functionArgument : ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName );
     public final CMISParser.functionArgument_return functionArgument() throws RecognitionException {
         CMISParser.functionArgument_return retval = new CMISParser.functionArgument_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token DOT29=null;
-        CMISParser.qualifier_return qualifier28 = null;
+        Token DOT32=null;
+        CMISParser.qualifier_return qualifier31 = null;
 
-        CMISParser.columnName_return columnName30 = null;
+        CMISParser.columnName_return columnName33 = null;
 
-        CMISParser.identifier_return identifier31 = null;
+        CMISParser.identifier_return identifier34 = null;
 
-        CMISParser.literalOrParameterName_return literalOrParameterName32 = null;
+        CMISParser.literalOrParameterName_return literalOrParameterName35 = null;
 
 
-        Object DOT29_tree=null;
+        Object DOT32_tree=null;
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:209:5: ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName )
-            int alt12=3;
-            alt12 = dfa12.predict(input);
-            switch (alt12) {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:359:5: ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName )
+            int alt14=3;
+            alt14 = dfa14.predict(input);
+            switch (alt14) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:209:9: qualifier DOT columnName
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:359:9: qualifier DOT columnName
                     {
-                    pushFollow(FOLLOW_qualifier_in_functionArgument520);
-                    qualifier28=qualifier();
+                    pushFollow(FOLLOW_qualifier_in_functionArgument717);
+                    qualifier31=qualifier();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier28.getTree());
-                    DOT29=(Token)match(input,DOT,FOLLOW_DOT_in_functionArgument522); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_DOT.add(DOT29);
+                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier31.getTree());
+                    DOT32=(Token)match(input,DOT,FOLLOW_DOT_in_functionArgument719); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_DOT.add(DOT32);
 
-                    pushFollow(FOLLOW_columnName_in_functionArgument524);
-                    columnName30=columnName();
+                    pushFollow(FOLLOW_columnName_in_functionArgument721);
+                    columnName33=columnName();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnName.add(columnName30.getTree());
+                    if ( state.backtracking==0 ) stream_columnName.add(columnName33.getTree());
 
 
                     // AST REWRITE
-                    // elements: qualifier, columnName
+                    // elements: columnName, qualifier
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -1327,9 +1556,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 210:5: -> ^( COLUMN_REF columnName qualifier )
+                    // 360:5: -> ^( COLUMN_REF columnName qualifier )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:210:8: ^( COLUMN_REF columnName qualifier )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:360:8: ^( COLUMN_REF columnName qualifier )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMN_REF, "COLUMN_REF"), root_1);
@@ -1346,30 +1575,30 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:211:9: identifier
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:361:9: identifier
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_identifier_in_functionArgument548);
-                    identifier31=identifier();
+                    pushFollow(FOLLOW_identifier_in_functionArgument745);
+                    identifier34=identifier();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, identifier31.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, identifier34.getTree());
 
                     }
                     break;
                 case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:212:9: literalOrParameterName
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:362:9: literalOrParameterName
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_literalOrParameterName_in_functionArgument558);
-                    literalOrParameterName32=literalOrParameterName();
+                    pushFollow(FOLLOW_literalOrParameterName_in_functionArgument755);
+                    literalOrParameterName35=literalOrParameterName();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, literalOrParameterName32.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, literalOrParameterName35.getTree());
 
                     }
                     break;
@@ -1384,10 +1613,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -1400,126 +1629,34 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "qualifier"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:215:1: qualifier : ( ( tableName )=> tableName -> tableName | correlationName -> correlationName );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:365:1: qualifier : ( ( tableName )=> tableName -> tableName | correlationName -> correlationName );
     public final CMISParser.qualifier_return qualifier() throws RecognitionException {
         CMISParser.qualifier_return retval = new CMISParser.qualifier_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.tableName_return tableName33 = null;
+        CMISParser.tableName_return tableName36 = null;
 
-        CMISParser.correlationName_return correlationName34 = null;
+        CMISParser.correlationName_return correlationName37 = null;
 
 
         RewriteRuleSubtreeStream stream_correlationName=new RewriteRuleSubtreeStream(adaptor,"rule correlationName");
         RewriteRuleSubtreeStream stream_tableName=new RewriteRuleSubtreeStream(adaptor,"rule tableName");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:216:2: ( ( tableName )=> tableName -> tableName | correlationName -> correlationName )
-            int alt13=2;
-            int LA13_0 = input.LA(1);
-
-            if ( (LA13_0==ID) ) {
-                int LA13_1 = input.LA(2);
-
-                if ( (synpred2_CMIS()) ) {
-                    alt13=1;
-                }
-                else if ( (true) ) {
-                    alt13=2;
-                }
-                else {
-                    if (state.backtracking>0) {state.failed=true; return retval;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("", 13, 1, input);
-
-                    throw nvae;
-                }
-            }
-            else if ( (LA13_0==DOUBLE_QUOTE) && ((strict == false))) {
-                int LA13_2 = input.LA(2);
-
-                if ( (LA13_2==SELECT||LA13_2==AS||(LA13_2>=FROM && LA13_2<=ON)||(LA13_2>=WHERE && LA13_2<=NOT)||(LA13_2>=IN && LA13_2<=DESC)||(LA13_2>=TRUE && LA13_2<=TIMESTAMP)) && ((strict == false))) {
-                    int LA13_5 = input.LA(3);
-
-                    if ( (LA13_5==DOUBLE_QUOTE) && ((strict == false))) {
-                        int LA13_7 = input.LA(4);
-
-                        if ( ((synpred2_CMIS()&&(strict == false))) ) {
-                            alt13=1;
-                        }
-                        else if ( ((strict == false)) ) {
-                            alt13=2;
-                        }
-                        else {
-                            if (state.backtracking>0) {state.failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("", 13, 7, input);
-
-                            throw nvae;
-                        }
-                    }
-                    else {
-                        if (state.backtracking>0) {state.failed=true; return retval;}
-                        NoViableAltException nvae =
-                            new NoViableAltException("", 13, 5, input);
-
-                        throw nvae;
-                    }
-                }
-                else if ( (LA13_2==ID) && ((strict == false))) {
-                    int LA13_6 = input.LA(3);
-
-                    if ( (LA13_6==DOUBLE_QUOTE) && ((strict == false))) {
-                        int LA13_7 = input.LA(4);
-
-                        if ( ((synpred2_CMIS()&&(strict == false))) ) {
-                            alt13=1;
-                        }
-                        else if ( ((strict == false)) ) {
-                            alt13=2;
-                        }
-                        else {
-                            if (state.backtracking>0) {state.failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("", 13, 7, input);
-
-                            throw nvae;
-                        }
-                    }
-                    else {
-                        if (state.backtracking>0) {state.failed=true; return retval;}
-                        NoViableAltException nvae =
-                            new NoViableAltException("", 13, 6, input);
-
-                        throw nvae;
-                    }
-                }
-                else {
-                    if (state.backtracking>0) {state.failed=true; return retval;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("", 13, 2, input);
-
-                    throw nvae;
-                }
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 13, 0, input);
-
-                throw nvae;
-            }
-            switch (alt13) {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:366:2: ( ( tableName )=> tableName -> tableName | correlationName -> correlationName )
+            int alt15=2;
+            alt15 = dfa15.predict(input);
+            switch (alt15) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:216:4: ( tableName )=> tableName
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:366:4: ( tableName )=> tableName
                     {
-                    pushFollow(FOLLOW_tableName_in_qualifier579);
-                    tableName33=tableName();
+                    pushFollow(FOLLOW_tableName_in_qualifier776);
+                    tableName36=tableName();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_tableName.add(tableName33.getTree());
+                    if ( state.backtracking==0 ) stream_tableName.add(tableName36.getTree());
 
 
                     // AST REWRITE
@@ -1534,7 +1671,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 217:3: -> tableName
+                    // 367:3: -> tableName
                     {
                         adaptor.addChild(root_0, stream_tableName.nextTree());
 
@@ -1544,14 +1681,14 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:218:5: correlationName
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:368:5: correlationName
                     {
-                    pushFollow(FOLLOW_correlationName_in_qualifier591);
-                    correlationName34=correlationName();
+                    pushFollow(FOLLOW_correlationName_in_qualifier788);
+                    correlationName37=correlationName();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_correlationName.add(correlationName34.getTree());
+                    if ( state.backtracking==0 ) stream_correlationName.add(correlationName37.getTree());
 
 
                     // AST REWRITE
@@ -1566,7 +1703,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 219:3: -> correlationName
+                    // 369:3: -> correlationName
                     {
                         adaptor.addChild(root_0, stream_correlationName.nextTree());
 
@@ -1586,10 +1723,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -1602,34 +1739,34 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "fromClause"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:222:1: fromClause : FROM tableReference -> tableReference ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:372:1: fromClause : FROM tableReference -> tableReference ;
     public final CMISParser.fromClause_return fromClause() throws RecognitionException {
         CMISParser.fromClause_return retval = new CMISParser.fromClause_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token FROM35=null;
-        CMISParser.tableReference_return tableReference36 = null;
+        Token FROM38=null;
+        CMISParser.tableReference_return tableReference39 = null;
 
 
-        Object FROM35_tree=null;
+        Object FROM38_tree=null;
         RewriteRuleTokenStream stream_FROM=new RewriteRuleTokenStream(adaptor,"token FROM");
         RewriteRuleSubtreeStream stream_tableReference=new RewriteRuleSubtreeStream(adaptor,"rule tableReference");
             paraphrases.push("in from"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:225:2: ( FROM tableReference -> tableReference )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:225:4: FROM tableReference
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:375:2: ( FROM tableReference -> tableReference )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:375:4: FROM tableReference
             {
-            FROM35=(Token)match(input,FROM,FOLLOW_FROM_in_fromClause628); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_FROM.add(FROM35);
+            FROM38=(Token)match(input,FROM,FOLLOW_FROM_in_fromClause833); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_FROM.add(FROM38);
 
-            pushFollow(FOLLOW_tableReference_in_fromClause630);
-            tableReference36=tableReference();
+            pushFollow(FOLLOW_tableReference_in_fromClause835);
+            tableReference39=tableReference();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_tableReference.add(tableReference36.getTree());
+            if ( state.backtracking==0 ) stream_tableReference.add(tableReference39.getTree());
 
 
             // AST REWRITE
@@ -1644,7 +1781,7 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 226:3: -> tableReference
+            // 376:3: -> tableReference
             {
                 adaptor.addChild(root_0, stream_tableReference.nextTree());
 
@@ -1665,10 +1802,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -1681,63 +1818,57 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "tableReference"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:229:1: tableReference : singleTable ( ( joinedTable )=> joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:379:1: tableReference : singleTable ( joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) ;
     public final CMISParser.tableReference_return tableReference() throws RecognitionException {
         CMISParser.tableReference_return retval = new CMISParser.tableReference_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.singleTable_return singleTable37 = null;
+        CMISParser.singleTable_return singleTable40 = null;
 
-        CMISParser.joinedTable_return joinedTable38 = null;
+        CMISParser.joinedTable_return joinedTable41 = null;
 
 
         RewriteRuleSubtreeStream stream_singleTable=new RewriteRuleSubtreeStream(adaptor,"rule singleTable");
         RewriteRuleSubtreeStream stream_joinedTable=new RewriteRuleSubtreeStream(adaptor,"rule joinedTable");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:230:2: ( singleTable ( ( joinedTable )=> joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:230:4: singleTable ( ( joinedTable )=> joinedTable )*
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:2: ( singleTable ( joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:4: singleTable ( joinedTable )*
             {
-            pushFollow(FOLLOW_singleTable_in_tableReference648);
-            singleTable37=singleTable();
+            pushFollow(FOLLOW_singleTable_in_tableReference856);
+            singleTable40=singleTable();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_singleTable.add(singleTable37.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:230:16: ( ( joinedTable )=> joinedTable )*
-            loop14:
+            if ( state.backtracking==0 ) stream_singleTable.add(singleTable40.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:16: ( joinedTable )*
+            loop16:
             do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
+                int alt16=2;
+                int LA16_0 = input.LA(1);
 
-                if ( (LA14_0==INNER) && (synpred3_CMIS())) {
-                    alt14=1;
-                }
-                else if ( (LA14_0==LEFT) && (synpred3_CMIS())) {
-                    alt14=1;
-                }
-                else if ( (LA14_0==JOIN) && (synpred3_CMIS())) {
-                    alt14=1;
+                if ( ((LA16_0>=JOIN && LA16_0<=LEFT)) ) {
+                    alt16=1;
                 }
 
 
-                switch (alt14) {
+                switch (alt16) {
             	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:230:17: ( joinedTable )=> joinedTable
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:16: joinedTable
             	    {
-            	    pushFollow(FOLLOW_joinedTable_in_tableReference657);
-            	    joinedTable38=joinedTable();
+            	    pushFollow(FOLLOW_joinedTable_in_tableReference858);
+            	    joinedTable41=joinedTable();
 
             	    state._fsp--;
             	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_joinedTable.add(joinedTable38.getTree());
+            	    if ( state.backtracking==0 ) stream_joinedTable.add(joinedTable41.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop14;
+            	    break loop16;
                 }
             } while (true);
 
@@ -1755,15 +1886,15 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 231:3: -> ^( SOURCE singleTable ( joinedTable )* )
+            // 381:3: -> ^( SOURCE singleTable ( joinedTable )* )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:231:6: ^( SOURCE singleTable ( joinedTable )* )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:6: ^( SOURCE singleTable ( joinedTable )* )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SOURCE, "SOURCE"), root_1);
 
                 adaptor.addChild(root_1, stream_singleTable.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:231:27: ( joinedTable )*
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:27: ( joinedTable )*
                 while ( stream_joinedTable.hasNext() ) {
                     adaptor.addChild(root_1, stream_joinedTable.nextTree());
 
@@ -1787,10 +1918,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -1803,26 +1934,26 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "singleTable"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:237:1: singleTable : ( tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) | LPAREN joinedTables RPAREN -> ^( TABLE joinedTables ) );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:387:1: singleTable : ( tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) | LPAREN joinedTables RPAREN -> ^( TABLE joinedTables ) );
     public final CMISParser.singleTable_return singleTable() throws RecognitionException {
         CMISParser.singleTable_return retval = new CMISParser.singleTable_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token AS40=null;
-        Token LPAREN42=null;
-        Token RPAREN44=null;
-        CMISParser.tableName_return tableName39 = null;
+        Token AS43=null;
+        Token LPAREN45=null;
+        Token RPAREN47=null;
+        CMISParser.tableName_return tableName42 = null;
 
-        CMISParser.correlationName_return correlationName41 = null;
+        CMISParser.correlationName_return correlationName44 = null;
 
-        CMISParser.joinedTables_return joinedTables43 = null;
+        CMISParser.joinedTables_return joinedTables46 = null;
 
 
-        Object AS40_tree=null;
-        Object LPAREN42_tree=null;
-        Object RPAREN44_tree=null;
+        Object AS43_tree=null;
+        Object LPAREN45_tree=null;
+        Object RPAREN47_tree=null;
         RewriteRuleTokenStream stream_AS=new RewriteRuleTokenStream(adaptor,"token AS");
         RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
         RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
@@ -1830,63 +1961,63 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_tableName=new RewriteRuleSubtreeStream(adaptor,"rule tableName");
         RewriteRuleSubtreeStream stream_joinedTables=new RewriteRuleSubtreeStream(adaptor,"rule joinedTables");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:238:2: ( tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) | LPAREN joinedTables RPAREN -> ^( TABLE joinedTables ) )
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:2: ( tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) | LPAREN joinedTables RPAREN -> ^( TABLE joinedTables ) )
+            int alt19=2;
+            int LA19_0 = input.LA(1);
 
-            if ( (LA17_0==ID) ) {
-                alt17=1;
+            if ( (LA19_0==ID) ) {
+                alt19=1;
             }
-            else if ( (LA17_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt17=1;
+            else if ( (LA19_0==DOUBLE_QUOTE) && ((strict == false))) {
+                alt19=1;
             }
-            else if ( (LA17_0==LPAREN) ) {
-                alt17=2;
+            else if ( (LA19_0==LPAREN) ) {
+                alt19=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 17, 0, input);
+                    new NoViableAltException("", 19, 0, input);
 
                 throw nvae;
             }
-            switch (alt17) {
+            switch (alt19) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:238:4: tableName ( ( AS )? correlationName )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:4: tableName ( ( AS )? correlationName )?
                     {
-                    pushFollow(FOLLOW_tableName_in_singleTable686);
-                    tableName39=tableName();
+                    pushFollow(FOLLOW_tableName_in_singleTable886);
+                    tableName42=tableName();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_tableName.add(tableName39.getTree());
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:238:14: ( ( AS )? correlationName )?
-                    int alt16=2;
-                    int LA16_0 = input.LA(1);
+                    if ( state.backtracking==0 ) stream_tableName.add(tableName42.getTree());
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:14: ( ( AS )? correlationName )?
+                    int alt18=2;
+                    int LA18_0 = input.LA(1);
 
-                    if ( (LA16_0==AS||LA16_0==ID) ) {
-                        alt16=1;
+                    if ( (LA18_0==AS||LA18_0==ID) ) {
+                        alt18=1;
                     }
-                    else if ( (LA16_0==DOUBLE_QUOTE) && ((strict == false))) {
-                        alt16=1;
+                    else if ( (LA18_0==DOUBLE_QUOTE) && ((strict == false))) {
+                        alt18=1;
                     }
-                    switch (alt16) {
+                    switch (alt18) {
                         case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:238:16: ( AS )? correlationName
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:16: ( AS )? correlationName
                             {
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:238:16: ( AS )?
-                            int alt15=2;
-                            int LA15_0 = input.LA(1);
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:16: ( AS )?
+                            int alt17=2;
+                            int LA17_0 = input.LA(1);
 
-                            if ( (LA15_0==AS) ) {
-                                alt15=1;
+                            if ( (LA17_0==AS) ) {
+                                alt17=1;
                             }
-                            switch (alt15) {
+                            switch (alt17) {
                                 case 1 :
-                                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:238:16: AS
+                                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:16: AS
                                     {
-                                    AS40=(Token)match(input,AS,FOLLOW_AS_in_singleTable690); if (state.failed) return retval; 
-                                    if ( state.backtracking==0 ) stream_AS.add(AS40);
+                                    AS43=(Token)match(input,AS,FOLLOW_AS_in_singleTable890); if (state.failed) return retval; 
+                                    if ( state.backtracking==0 ) stream_AS.add(AS43);
 
 
                                     }
@@ -1894,12 +2025,12 @@ public class CMISParser extends Parser {
 
                             }
 
-                            pushFollow(FOLLOW_correlationName_in_singleTable693);
-                            correlationName41=correlationName();
+                            pushFollow(FOLLOW_correlationName_in_singleTable893);
+                            correlationName44=correlationName();
 
                             state._fsp--;
                             if (state.failed) return retval;
-                            if ( state.backtracking==0 ) stream_correlationName.add(correlationName41.getTree());
+                            if ( state.backtracking==0 ) stream_correlationName.add(correlationName44.getTree());
 
                             }
                             break;
@@ -1920,15 +2051,15 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 239:3: -> ^( TABLE_REF tableName ( correlationName )? )
+                    // 389:3: -> ^( TABLE_REF tableName ( correlationName )? )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:239:6: ^( TABLE_REF tableName ( correlationName )? )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:389:6: ^( TABLE_REF tableName ( correlationName )? )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(TABLE_REF, "TABLE_REF"), root_1);
 
                         adaptor.addChild(root_1, stream_tableName.nextTree());
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:239:28: ( correlationName )?
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:389:28: ( correlationName )?
                         if ( stream_correlationName.hasNext() ) {
                             adaptor.addChild(root_1, stream_correlationName.nextTree());
 
@@ -1944,19 +2075,19 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:240:4: LPAREN joinedTables RPAREN
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:390:4: LPAREN joinedTables RPAREN
                     {
-                    LPAREN42=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_singleTable714); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN42);
+                    LPAREN45=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_singleTable914); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN45);
 
-                    pushFollow(FOLLOW_joinedTables_in_singleTable716);
-                    joinedTables43=joinedTables();
+                    pushFollow(FOLLOW_joinedTables_in_singleTable916);
+                    joinedTables46=joinedTables();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_joinedTables.add(joinedTables43.getTree());
-                    RPAREN44=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_singleTable718); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN44);
+                    if ( state.backtracking==0 ) stream_joinedTables.add(joinedTables46.getTree());
+                    RPAREN47=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_singleTable918); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN47);
 
 
 
@@ -1972,9 +2103,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 241:3: -> ^( TABLE joinedTables )
+                    // 391:3: -> ^( TABLE joinedTables )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:241:6: ^( TABLE joinedTables )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:391:6: ^( TABLE joinedTables )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(TABLE, "TABLE"), root_1);
@@ -2000,10 +2131,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2016,72 +2147,73 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "joinedTable"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:244:1: joinedTable : ( joinType )? JOIN tableReference ( joinSpecification )=> joinSpecification -> ^( JOIN tableReference ( joinType )? joinSpecification ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:394:1: joinedTable : ( joinType )? JOIN tableReference joinSpecification -> ^( JOIN tableReference ( joinType )? joinSpecification ) ;
     public final CMISParser.joinedTable_return joinedTable() throws RecognitionException {
         CMISParser.joinedTable_return retval = new CMISParser.joinedTable_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token JOIN46=null;
-        CMISParser.joinType_return joinType45 = null;
+        Token JOIN49=null;
+        CMISParser.joinType_return joinType48 = null;
 
-        CMISParser.tableReference_return tableReference47 = null;
+        CMISParser.tableReference_return tableReference50 = null;
 
-        CMISParser.joinSpecification_return joinSpecification48 = null;
+        CMISParser.joinSpecification_return joinSpecification51 = null;
 
 
-        Object JOIN46_tree=null;
+        Object JOIN49_tree=null;
         RewriteRuleTokenStream stream_JOIN=new RewriteRuleTokenStream(adaptor,"token JOIN");
         RewriteRuleSubtreeStream stream_tableReference=new RewriteRuleSubtreeStream(adaptor,"rule tableReference");
         RewriteRuleSubtreeStream stream_joinType=new RewriteRuleSubtreeStream(adaptor,"rule joinType");
         RewriteRuleSubtreeStream stream_joinSpecification=new RewriteRuleSubtreeStream(adaptor,"rule joinSpecification");
+            paraphrases.push("in join"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:245:2: ( ( joinType )? JOIN tableReference ( joinSpecification )=> joinSpecification -> ^( JOIN tableReference ( joinType )? joinSpecification ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:245:4: ( joinType )? JOIN tableReference ( joinSpecification )=> joinSpecification
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:397:2: ( ( joinType )? JOIN tableReference joinSpecification -> ^( JOIN tableReference ( joinType )? joinSpecification ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:397:4: ( joinType )? JOIN tableReference joinSpecification
             {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:245:4: ( joinType )?
-            int alt18=2;
-            int LA18_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:397:4: ( joinType )?
+            int alt20=2;
+            int LA20_0 = input.LA(1);
 
-            if ( ((LA18_0>=INNER && LA18_0<=LEFT)) ) {
-                alt18=1;
+            if ( ((LA20_0>=INNER && LA20_0<=LEFT)) ) {
+                alt20=1;
             }
-            switch (alt18) {
+            switch (alt20) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:245:4: joinType
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:397:4: joinType
                     {
-                    pushFollow(FOLLOW_joinType_in_joinedTable740);
-                    joinType45=joinType();
+                    pushFollow(FOLLOW_joinType_in_joinedTable966);
+                    joinType48=joinType();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_joinType.add(joinType45.getTree());
+                    if ( state.backtracking==0 ) stream_joinType.add(joinType48.getTree());
 
                     }
                     break;
 
             }
 
-            JOIN46=(Token)match(input,JOIN,FOLLOW_JOIN_in_joinedTable743); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_JOIN.add(JOIN46);
+            JOIN49=(Token)match(input,JOIN,FOLLOW_JOIN_in_joinedTable969); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_JOIN.add(JOIN49);
 
-            pushFollow(FOLLOW_tableReference_in_joinedTable745);
-            tableReference47=tableReference();
+            pushFollow(FOLLOW_tableReference_in_joinedTable971);
+            tableReference50=tableReference();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_tableReference.add(tableReference47.getTree());
-            pushFollow(FOLLOW_joinSpecification_in_joinedTable753);
-            joinSpecification48=joinSpecification();
+            if ( state.backtracking==0 ) stream_tableReference.add(tableReference50.getTree());
+            pushFollow(FOLLOW_joinSpecification_in_joinedTable973);
+            joinSpecification51=joinSpecification();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_joinSpecification.add(joinSpecification48.getTree());
+            if ( state.backtracking==0 ) stream_joinSpecification.add(joinSpecification51.getTree());
 
 
             // AST REWRITE
-            // elements: joinSpecification, joinType, tableReference, JOIN
+            // elements: joinType, joinSpecification, tableReference, JOIN
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2092,15 +2224,15 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 246:3: -> ^( JOIN tableReference ( joinType )? joinSpecification )
+            // 398:3: -> ^( JOIN tableReference ( joinType )? joinSpecification )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:246:6: ^( JOIN tableReference ( joinType )? joinSpecification )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:398:6: ^( JOIN tableReference ( joinType )? joinSpecification )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_JOIN.nextNode(), root_1);
 
                 adaptor.addChild(root_1, stream_tableReference.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:246:28: ( joinType )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:398:28: ( joinType )?
                 if ( stream_joinType.hasNext() ) {
                     adaptor.addChild(root_1, stream_joinType.nextTree());
 
@@ -2123,12 +2255,15 @@ public class CMISParser extends Parser {
             retval.tree = (Object)adaptor.rulePostProcessing(root_0);
             adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( state.backtracking==0 ) {
+                  paraphrases.pop(); 
+            }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2141,70 +2276,70 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "joinedTables"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:250:1: joinedTables : singleTable ( joinedTable )+ -> ^( SOURCE singleTable ( joinedTable )+ ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:402:1: joinedTables : singleTable ( joinedTable )+ -> ^( SOURCE singleTable ( joinedTable )+ ) ;
     public final CMISParser.joinedTables_return joinedTables() throws RecognitionException {
         CMISParser.joinedTables_return retval = new CMISParser.joinedTables_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.singleTable_return singleTable49 = null;
+        CMISParser.singleTable_return singleTable52 = null;
 
-        CMISParser.joinedTable_return joinedTable50 = null;
+        CMISParser.joinedTable_return joinedTable53 = null;
 
 
         RewriteRuleSubtreeStream stream_singleTable=new RewriteRuleSubtreeStream(adaptor,"rule singleTable");
         RewriteRuleSubtreeStream stream_joinedTable=new RewriteRuleSubtreeStream(adaptor,"rule joinedTable");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:251:2: ( singleTable ( joinedTable )+ -> ^( SOURCE singleTable ( joinedTable )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:251:4: singleTable ( joinedTable )+
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:403:2: ( singleTable ( joinedTable )+ -> ^( SOURCE singleTable ( joinedTable )+ ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:403:4: singleTable ( joinedTable )+
             {
-            pushFollow(FOLLOW_singleTable_in_joinedTables781);
-            singleTable49=singleTable();
+            pushFollow(FOLLOW_singleTable_in_joinedTables1001);
+            singleTable52=singleTable();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_singleTable.add(singleTable49.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:251:16: ( joinedTable )+
-            int cnt19=0;
-            loop19:
+            if ( state.backtracking==0 ) stream_singleTable.add(singleTable52.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:403:16: ( joinedTable )+
+            int cnt21=0;
+            loop21:
             do {
-                int alt19=2;
-                int LA19_0 = input.LA(1);
+                int alt21=2;
+                int LA21_0 = input.LA(1);
 
-                if ( ((LA19_0>=JOIN && LA19_0<=LEFT)) ) {
-                    alt19=1;
+                if ( ((LA21_0>=JOIN && LA21_0<=LEFT)) ) {
+                    alt21=1;
                 }
 
 
-                switch (alt19) {
+                switch (alt21) {
             	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:251:16: joinedTable
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:403:16: joinedTable
             	    {
-            	    pushFollow(FOLLOW_joinedTable_in_joinedTables783);
-            	    joinedTable50=joinedTable();
+            	    pushFollow(FOLLOW_joinedTable_in_joinedTables1003);
+            	    joinedTable53=joinedTable();
 
             	    state._fsp--;
             	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_joinedTable.add(joinedTable50.getTree());
+            	    if ( state.backtracking==0 ) stream_joinedTable.add(joinedTable53.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    if ( cnt19 >= 1 ) break loop19;
+            	    if ( cnt21 >= 1 ) break loop21;
             	    if (state.backtracking>0) {state.failed=true; return retval;}
                         EarlyExitException eee =
-                            new EarlyExitException(19, input);
+                            new EarlyExitException(21, input);
                         throw eee;
                 }
-                cnt19++;
+                cnt21++;
             } while (true);
 
 
 
             // AST REWRITE
-            // elements: joinedTable, singleTable
+            // elements: singleTable, joinedTable
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2215,9 +2350,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 252:3: -> ^( SOURCE singleTable ( joinedTable )+ )
+            // 404:3: -> ^( SOURCE singleTable ( joinedTable )+ )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:252:6: ^( SOURCE singleTable ( joinedTable )+ )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:404:6: ^( SOURCE singleTable ( joinedTable )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SOURCE, "SOURCE"), root_1);
@@ -2249,10 +2384,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2265,48 +2400,48 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "joinType"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:255:1: joinType : ( INNER -> INNER | LEFT ( OUTER )? -> LEFT );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:407:1: joinType : ( INNER -> INNER | LEFT ( OUTER )? -> LEFT );
     public final CMISParser.joinType_return joinType() throws RecognitionException {
         CMISParser.joinType_return retval = new CMISParser.joinType_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token INNER51=null;
-        Token LEFT52=null;
-        Token OUTER53=null;
+        Token INNER54=null;
+        Token LEFT55=null;
+        Token OUTER56=null;
 
-        Object INNER51_tree=null;
-        Object LEFT52_tree=null;
-        Object OUTER53_tree=null;
+        Object INNER54_tree=null;
+        Object LEFT55_tree=null;
+        Object OUTER56_tree=null;
         RewriteRuleTokenStream stream_OUTER=new RewriteRuleTokenStream(adaptor,"token OUTER");
         RewriteRuleTokenStream stream_INNER=new RewriteRuleTokenStream(adaptor,"token INNER");
         RewriteRuleTokenStream stream_LEFT=new RewriteRuleTokenStream(adaptor,"token LEFT");
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:256:2: ( INNER -> INNER | LEFT ( OUTER )? -> LEFT )
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:408:2: ( INNER -> INNER | LEFT ( OUTER )? -> LEFT )
+            int alt23=2;
+            int LA23_0 = input.LA(1);
 
-            if ( (LA21_0==INNER) ) {
-                alt21=1;
+            if ( (LA23_0==INNER) ) {
+                alt23=1;
             }
-            else if ( (LA21_0==LEFT) ) {
-                alt21=2;
+            else if ( (LA23_0==LEFT) ) {
+                alt23=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 21, 0, input);
+                    new NoViableAltException("", 23, 0, input);
 
                 throw nvae;
             }
-            switch (alt21) {
+            switch (alt23) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:256:4: INNER
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:408:4: INNER
                     {
-                    INNER51=(Token)match(input,INNER,FOLLOW_INNER_in_joinType810); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_INNER.add(INNER51);
+                    INNER54=(Token)match(input,INNER,FOLLOW_INNER_in_joinType1030); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_INNER.add(INNER54);
 
 
 
@@ -2322,7 +2457,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 257:3: -> INNER
+                    // 409:3: -> INNER
                     {
                         adaptor.addChild(root_0, stream_INNER.nextNode());
 
@@ -2332,24 +2467,24 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:258:5: LEFT ( OUTER )?
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:410:5: LEFT ( OUTER )?
                     {
-                    LEFT52=(Token)match(input,LEFT,FOLLOW_LEFT_in_joinType822); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LEFT.add(LEFT52);
+                    LEFT55=(Token)match(input,LEFT,FOLLOW_LEFT_in_joinType1042); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_LEFT.add(LEFT55);
 
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:258:10: ( OUTER )?
-                    int alt20=2;
-                    int LA20_0 = input.LA(1);
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:410:10: ( OUTER )?
+                    int alt22=2;
+                    int LA22_0 = input.LA(1);
 
-                    if ( (LA20_0==OUTER) ) {
-                        alt20=1;
+                    if ( (LA22_0==OUTER) ) {
+                        alt22=1;
                     }
-                    switch (alt20) {
+                    switch (alt22) {
                         case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:258:10: OUTER
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:410:10: OUTER
                             {
-                            OUTER53=(Token)match(input,OUTER,FOLLOW_OUTER_in_joinType824); if (state.failed) return retval; 
-                            if ( state.backtracking==0 ) stream_OUTER.add(OUTER53);
+                            OUTER56=(Token)match(input,OUTER,FOLLOW_OUTER_in_joinType1044); if (state.failed) return retval; 
+                            if ( state.backtracking==0 ) stream_OUTER.add(OUTER56);
 
 
                             }
@@ -2371,7 +2506,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 259:3: -> LEFT
+                    // 411:3: -> LEFT
                     {
                         adaptor.addChild(root_0, stream_LEFT.nextNode());
 
@@ -2391,10 +2526,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2407,42 +2542,43 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "joinSpecification"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:262:1: joinSpecification : ON lhs= columnReference EQUALS rhs= columnReference -> ^( ON $lhs EQUALS $rhs) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:414:1: joinSpecification : ON lhs= columnReference EQUALS rhs= columnReference -> ^( ON $lhs EQUALS $rhs) ;
     public final CMISParser.joinSpecification_return joinSpecification() throws RecognitionException {
         CMISParser.joinSpecification_return retval = new CMISParser.joinSpecification_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ON54=null;
-        Token EQUALS55=null;
+        Token ON57=null;
+        Token EQUALS58=null;
         CMISParser.columnReference_return lhs = null;
 
         CMISParser.columnReference_return rhs = null;
 
 
-        Object ON54_tree=null;
-        Object EQUALS55_tree=null;
+        Object ON57_tree=null;
+        Object EQUALS58_tree=null;
         RewriteRuleTokenStream stream_ON=new RewriteRuleTokenStream(adaptor,"token ON");
         RewriteRuleTokenStream stream_EQUALS=new RewriteRuleTokenStream(adaptor,"token EQUALS");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
+            paraphrases.push("in join condition"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:263:2: ( ON lhs= columnReference EQUALS rhs= columnReference -> ^( ON $lhs EQUALS $rhs) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:263:4: ON lhs= columnReference EQUALS rhs= columnReference
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:417:2: ( ON lhs= columnReference EQUALS rhs= columnReference -> ^( ON $lhs EQUALS $rhs) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:417:4: ON lhs= columnReference EQUALS rhs= columnReference
             {
-            ON54=(Token)match(input,ON,FOLLOW_ON_in_joinSpecification844); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_ON.add(ON54);
+            ON57=(Token)match(input,ON,FOLLOW_ON_in_joinSpecification1090); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_ON.add(ON57);
 
-            pushFollow(FOLLOW_columnReference_in_joinSpecification848);
+            pushFollow(FOLLOW_columnReference_in_joinSpecification1094);
             lhs=columnReference();
 
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_columnReference.add(lhs.getTree());
-            EQUALS55=(Token)match(input,EQUALS,FOLLOW_EQUALS_in_joinSpecification850); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_EQUALS.add(EQUALS55);
+            EQUALS58=(Token)match(input,EQUALS,FOLLOW_EQUALS_in_joinSpecification1096); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_EQUALS.add(EQUALS58);
 
-            pushFollow(FOLLOW_columnReference_in_joinSpecification854);
+            pushFollow(FOLLOW_columnReference_in_joinSpecification1100);
             rhs=columnReference();
 
             state._fsp--;
@@ -2451,7 +2587,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: lhs, ON, rhs, EQUALS
+            // elements: EQUALS, lhs, rhs, ON
             // token labels: 
             // rule labels: retval, rhs, lhs
             // token list labels: 
@@ -2464,9 +2600,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_lhs=new RewriteRuleSubtreeStream(adaptor,"rule lhs",lhs!=null?lhs.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 264:3: -> ^( ON $lhs EQUALS $rhs)
+            // 418:3: -> ^( ON $lhs EQUALS $rhs)
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:264:6: ^( ON $lhs EQUALS $rhs)
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:6: ^( ON $lhs EQUALS $rhs)
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_ON.nextNode(), root_1);
@@ -2490,12 +2626,15 @@ public class CMISParser extends Parser {
             retval.tree = (Object)adaptor.rulePostProcessing(root_0);
             adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( state.backtracking==0 ) {
+                  paraphrases.pop(); 
+            }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2508,34 +2647,34 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "whereClause"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:271:1: whereClause : WHERE searchOrCondition -> searchOrCondition ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:425:1: whereClause : WHERE searchOrCondition -> searchOrCondition ;
     public final CMISParser.whereClause_return whereClause() throws RecognitionException {
         CMISParser.whereClause_return retval = new CMISParser.whereClause_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token WHERE56=null;
-        CMISParser.searchOrCondition_return searchOrCondition57 = null;
+        Token WHERE59=null;
+        CMISParser.searchOrCondition_return searchOrCondition60 = null;
 
 
-        Object WHERE56_tree=null;
+        Object WHERE59_tree=null;
         RewriteRuleTokenStream stream_WHERE=new RewriteRuleTokenStream(adaptor,"token WHERE");
         RewriteRuleSubtreeStream stream_searchOrCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchOrCondition");
             paraphrases.push("in where"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:274:2: ( WHERE searchOrCondition -> searchOrCondition )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:274:4: WHERE searchOrCondition
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:428:2: ( WHERE searchOrCondition -> searchOrCondition )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:428:4: WHERE searchOrCondition
             {
-            WHERE56=(Token)match(input,WHERE,FOLLOW_WHERE_in_whereClause905); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_WHERE.add(WHERE56);
+            WHERE59=(Token)match(input,WHERE,FOLLOW_WHERE_in_whereClause1159); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_WHERE.add(WHERE59);
 
-            pushFollow(FOLLOW_searchOrCondition_in_whereClause907);
-            searchOrCondition57=searchOrCondition();
+            pushFollow(FOLLOW_searchOrCondition_in_whereClause1161);
+            searchOrCondition60=searchOrCondition();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_searchOrCondition.add(searchOrCondition57.getTree());
+            if ( state.backtracking==0 ) stream_searchOrCondition.add(searchOrCondition60.getTree());
 
 
             // AST REWRITE
@@ -2550,7 +2689,7 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 275:3: -> searchOrCondition
+            // 429:3: -> searchOrCondition
             {
                 adaptor.addChild(root_0, stream_searchOrCondition.nextTree());
 
@@ -2571,10 +2710,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2587,62 +2726,62 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "searchOrCondition"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:278:1: searchOrCondition : searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:432:1: searchOrCondition : searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) ;
     public final CMISParser.searchOrCondition_return searchOrCondition() throws RecognitionException {
         CMISParser.searchOrCondition_return retval = new CMISParser.searchOrCondition_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token OR59=null;
-        CMISParser.searchAndCondition_return searchAndCondition58 = null;
+        Token OR62=null;
+        CMISParser.searchAndCondition_return searchAndCondition61 = null;
 
-        CMISParser.searchAndCondition_return searchAndCondition60 = null;
+        CMISParser.searchAndCondition_return searchAndCondition63 = null;
 
 
-        Object OR59_tree=null;
+        Object OR62_tree=null;
         RewriteRuleTokenStream stream_OR=new RewriteRuleTokenStream(adaptor,"token OR");
         RewriteRuleSubtreeStream stream_searchAndCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchAndCondition");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:282:2: ( searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:282:4: searchAndCondition ( OR searchAndCondition )*
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:436:2: ( searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:436:4: searchAndCondition ( OR searchAndCondition )*
             {
-            pushFollow(FOLLOW_searchAndCondition_in_searchOrCondition927);
-            searchAndCondition58=searchAndCondition();
+            pushFollow(FOLLOW_searchAndCondition_in_searchOrCondition1181);
+            searchAndCondition61=searchAndCondition();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_searchAndCondition.add(searchAndCondition58.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:282:23: ( OR searchAndCondition )*
-            loop22:
+            if ( state.backtracking==0 ) stream_searchAndCondition.add(searchAndCondition61.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:436:23: ( OR searchAndCondition )*
+            loop24:
             do {
-                int alt22=2;
-                int LA22_0 = input.LA(1);
+                int alt24=2;
+                int LA24_0 = input.LA(1);
 
-                if ( (LA22_0==OR) ) {
-                    alt22=1;
+                if ( (LA24_0==OR) ) {
+                    alt24=1;
                 }
 
 
-                switch (alt22) {
+                switch (alt24) {
             	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:282:24: OR searchAndCondition
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:436:24: OR searchAndCondition
             	    {
-            	    OR59=(Token)match(input,OR,FOLLOW_OR_in_searchOrCondition930); if (state.failed) return retval; 
-            	    if ( state.backtracking==0 ) stream_OR.add(OR59);
+            	    OR62=(Token)match(input,OR,FOLLOW_OR_in_searchOrCondition1184); if (state.failed) return retval; 
+            	    if ( state.backtracking==0 ) stream_OR.add(OR62);
 
-            	    pushFollow(FOLLOW_searchAndCondition_in_searchOrCondition932);
-            	    searchAndCondition60=searchAndCondition();
+            	    pushFollow(FOLLOW_searchAndCondition_in_searchOrCondition1186);
+            	    searchAndCondition63=searchAndCondition();
 
             	    state._fsp--;
             	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_searchAndCondition.add(searchAndCondition60.getTree());
+            	    if ( state.backtracking==0 ) stream_searchAndCondition.add(searchAndCondition63.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop22;
+            	    break loop24;
                 }
             } while (true);
 
@@ -2660,9 +2799,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 283:3: -> ^( DISJUNCTION ( searchAndCondition )+ )
+            // 437:3: -> ^( DISJUNCTION ( searchAndCondition )+ )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:283:6: ^( DISJUNCTION ( searchAndCondition )+ )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:437:6: ^( DISJUNCTION ( searchAndCondition )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DISJUNCTION, "DISJUNCTION"), root_1);
@@ -2693,10 +2832,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2709,62 +2848,62 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "searchAndCondition"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:287:1: searchAndCondition : searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:441:1: searchAndCondition : searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) ;
     public final CMISParser.searchAndCondition_return searchAndCondition() throws RecognitionException {
         CMISParser.searchAndCondition_return retval = new CMISParser.searchAndCondition_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token AND62=null;
-        CMISParser.searchNotCondition_return searchNotCondition61 = null;
+        Token AND65=null;
+        CMISParser.searchNotCondition_return searchNotCondition64 = null;
 
-        CMISParser.searchNotCondition_return searchNotCondition63 = null;
+        CMISParser.searchNotCondition_return searchNotCondition66 = null;
 
 
-        Object AND62_tree=null;
+        Object AND65_tree=null;
         RewriteRuleTokenStream stream_AND=new RewriteRuleTokenStream(adaptor,"token AND");
         RewriteRuleSubtreeStream stream_searchNotCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchNotCondition");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:291:2: ( searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:291:4: searchNotCondition ( AND searchNotCondition )*
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:445:2: ( searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:445:4: searchNotCondition ( AND searchNotCondition )*
             {
-            pushFollow(FOLLOW_searchNotCondition_in_searchAndCondition960);
-            searchNotCondition61=searchNotCondition();
+            pushFollow(FOLLOW_searchNotCondition_in_searchAndCondition1214);
+            searchNotCondition64=searchNotCondition();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_searchNotCondition.add(searchNotCondition61.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:291:23: ( AND searchNotCondition )*
-            loop23:
+            if ( state.backtracking==0 ) stream_searchNotCondition.add(searchNotCondition64.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:445:23: ( AND searchNotCondition )*
+            loop25:
             do {
-                int alt23=2;
-                int LA23_0 = input.LA(1);
+                int alt25=2;
+                int LA25_0 = input.LA(1);
 
-                if ( (LA23_0==AND) ) {
-                    alt23=1;
+                if ( (LA25_0==AND) ) {
+                    alt25=1;
                 }
 
 
-                switch (alt23) {
+                switch (alt25) {
             	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:291:24: AND searchNotCondition
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:445:24: AND searchNotCondition
             	    {
-            	    AND62=(Token)match(input,AND,FOLLOW_AND_in_searchAndCondition963); if (state.failed) return retval; 
-            	    if ( state.backtracking==0 ) stream_AND.add(AND62);
+            	    AND65=(Token)match(input,AND,FOLLOW_AND_in_searchAndCondition1217); if (state.failed) return retval; 
+            	    if ( state.backtracking==0 ) stream_AND.add(AND65);
 
-            	    pushFollow(FOLLOW_searchNotCondition_in_searchAndCondition965);
-            	    searchNotCondition63=searchNotCondition();
+            	    pushFollow(FOLLOW_searchNotCondition_in_searchAndCondition1219);
+            	    searchNotCondition66=searchNotCondition();
 
             	    state._fsp--;
             	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_searchNotCondition.add(searchNotCondition63.getTree());
+            	    if ( state.backtracking==0 ) stream_searchNotCondition.add(searchNotCondition66.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop23;
+            	    break loop25;
                 }
             } while (true);
 
@@ -2782,9 +2921,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 292:3: -> ^( CONJUNCTION ( searchNotCondition )+ )
+            // 446:3: -> ^( CONJUNCTION ( searchNotCondition )+ )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:292:6: ^( CONJUNCTION ( searchNotCondition )+ )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:446:6: ^( CONJUNCTION ( searchNotCondition )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(CONJUNCTION, "CONJUNCTION"), root_1);
@@ -2815,10 +2954,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2831,39 +2970,39 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "searchNotCondition"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:1: searchNotCondition : ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:449:1: searchNotCondition : ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest );
     public final CMISParser.searchNotCondition_return searchNotCondition() throws RecognitionException {
         CMISParser.searchNotCondition_return retval = new CMISParser.searchNotCondition_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token NOT64=null;
-        CMISParser.searchTest_return searchTest65 = null;
+        Token NOT67=null;
+        CMISParser.searchTest_return searchTest68 = null;
 
-        CMISParser.searchTest_return searchTest66 = null;
+        CMISParser.searchTest_return searchTest69 = null;
 
 
-        Object NOT64_tree=null;
+        Object NOT67_tree=null;
         RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
         RewriteRuleSubtreeStream stream_searchTest=new RewriteRuleSubtreeStream(adaptor,"rule searchTest");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:296:2: ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest )
-            int alt24=2;
-            alt24 = dfa24.predict(input);
-            switch (alt24) {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:450:2: ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest )
+            int alt26=2;
+            alt26 = dfa26.predict(input);
+            switch (alt26) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:296:4: NOT searchTest
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:450:4: NOT searchTest
                     {
-                    NOT64=(Token)match(input,NOT,FOLLOW_NOT_in_searchNotCondition992); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT64);
+                    NOT67=(Token)match(input,NOT,FOLLOW_NOT_in_searchNotCondition1246); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_NOT.add(NOT67);
 
-                    pushFollow(FOLLOW_searchTest_in_searchNotCondition994);
-                    searchTest65=searchTest();
+                    pushFollow(FOLLOW_searchTest_in_searchNotCondition1248);
+                    searchTest68=searchTest();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_searchTest.add(searchTest65.getTree());
+                    if ( state.backtracking==0 ) stream_searchTest.add(searchTest68.getTree());
 
 
                     // AST REWRITE
@@ -2878,9 +3017,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 297:3: -> ^( NEGATION searchTest )
+                    // 451:3: -> ^( NEGATION searchTest )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:297:6: ^( NEGATION searchTest )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:451:6: ^( NEGATION searchTest )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(NEGATION, "NEGATION"), root_1);
@@ -2896,14 +3035,14 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:298:4: searchTest
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:452:4: searchTest
                     {
-                    pushFollow(FOLLOW_searchTest_in_searchNotCondition1009);
-                    searchTest66=searchTest();
+                    pushFollow(FOLLOW_searchTest_in_searchNotCondition1263);
+                    searchTest69=searchTest();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_searchTest.add(searchTest66.getTree());
+                    if ( state.backtracking==0 ) stream_searchTest.add(searchTest69.getTree());
 
 
                     // AST REWRITE
@@ -2918,7 +3057,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 299:3: -> searchTest
+                    // 453:3: -> searchTest
                     {
                         adaptor.addChild(root_0, stream_searchTest.nextTree());
 
@@ -2938,10 +3077,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -2954,66 +3093,40 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "searchTest"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:302:1: searchTest : ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:456:1: searchTest : ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition );
     public final CMISParser.searchTest_return searchTest() throws RecognitionException {
         CMISParser.searchTest_return retval = new CMISParser.searchTest_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LPAREN68=null;
-        Token RPAREN70=null;
-        CMISParser.predicate_return predicate67 = null;
+        Token LPAREN71=null;
+        Token RPAREN73=null;
+        CMISParser.predicate_return predicate70 = null;
 
-        CMISParser.searchOrCondition_return searchOrCondition69 = null;
+        CMISParser.searchOrCondition_return searchOrCondition72 = null;
 
 
-        Object LPAREN68_tree=null;
-        Object RPAREN70_tree=null;
+        Object LPAREN71_tree=null;
+        Object RPAREN73_tree=null;
         RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
         RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
         RewriteRuleSubtreeStream stream_predicate=new RewriteRuleSubtreeStream(adaptor,"rule predicate");
         RewriteRuleSubtreeStream stream_searchOrCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchOrCondition");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:303:2: ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition )
-            int alt25=2;
-            int LA25_0 = input.LA(1);
-
-            if ( (LA25_0==ID) ) {
-                alt25=1;
-            }
-            else if ( (LA25_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt25=1;
-            }
-            else if ( (LA25_0==ANY||LA25_0==QUOTED_STRING||(LA25_0>=FLOATING_POINT_LITERAL && LA25_0<=TIMESTAMP)) ) {
-                alt25=1;
-            }
-            else if ( (LA25_0==COLON) && ((strict == false))) {
-                alt25=1;
-            }
-            else if ( (LA25_0==SELECT||LA25_0==AS||(LA25_0>=FROM && LA25_0<=ON)||(LA25_0>=WHERE && LA25_0<=NOT)||(LA25_0>=IN && LA25_0<=NULL)||(LA25_0>=CONTAINS && LA25_0<=DESC)) ) {
-                alt25=1;
-            }
-            else if ( (LA25_0==LPAREN) ) {
-                alt25=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 25, 0, input);
-
-                throw nvae;
-            }
-            switch (alt25) {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:457:2: ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition )
+            int alt27=2;
+            alt27 = dfa27.predict(input);
+            switch (alt27) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:303:4: predicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:457:4: predicate
                     {
-                    pushFollow(FOLLOW_predicate_in_searchTest1027);
-                    predicate67=predicate();
+                    pushFollow(FOLLOW_predicate_in_searchTest1281);
+                    predicate70=predicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_predicate.add(predicate67.getTree());
+                    if ( state.backtracking==0 ) stream_predicate.add(predicate70.getTree());
 
 
                     // AST REWRITE
@@ -3028,7 +3141,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 304:3: -> predicate
+                    // 458:3: -> predicate
                     {
                         adaptor.addChild(root_0, stream_predicate.nextTree());
 
@@ -3038,19 +3151,19 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:305:4: LPAREN searchOrCondition RPAREN
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:459:4: LPAREN searchOrCondition RPAREN
                     {
-                    LPAREN68=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_searchTest1038); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN68);
+                    LPAREN71=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_searchTest1292); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN71);
 
-                    pushFollow(FOLLOW_searchOrCondition_in_searchTest1040);
-                    searchOrCondition69=searchOrCondition();
+                    pushFollow(FOLLOW_searchOrCondition_in_searchTest1294);
+                    searchOrCondition72=searchOrCondition();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_searchOrCondition.add(searchOrCondition69.getTree());
-                    RPAREN70=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_searchTest1042); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN70);
+                    if ( state.backtracking==0 ) stream_searchOrCondition.add(searchOrCondition72.getTree());
+                    RPAREN73=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_searchTest1296); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN73);
 
 
 
@@ -3066,7 +3179,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 306:3: -> searchOrCondition
+                    // 460:3: -> searchOrCondition
                     {
                         adaptor.addChild(root_0, stream_searchOrCondition.nextTree());
 
@@ -3086,10 +3199,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -3102,145 +3215,145 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "predicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:309:1: predicate : ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:463:1: predicate : ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate );
     public final CMISParser.predicate_return predicate() throws RecognitionException {
         CMISParser.predicate_return retval = new CMISParser.predicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.comparisonPredicate_return comparisonPredicate71 = null;
+        CMISParser.comparisonPredicate_return comparisonPredicate74 = null;
 
-        CMISParser.inPredicate_return inPredicate72 = null;
+        CMISParser.inPredicate_return inPredicate75 = null;
 
-        CMISParser.likePredicate_return likePredicate73 = null;
+        CMISParser.likePredicate_return likePredicate76 = null;
 
-        CMISParser.nullPredicate_return nullPredicate74 = null;
+        CMISParser.nullPredicate_return nullPredicate77 = null;
 
-        CMISParser.quantifiedComparisonPredicate_return quantifiedComparisonPredicate75 = null;
+        CMISParser.quantifiedComparisonPredicate_return quantifiedComparisonPredicate78 = null;
 
-        CMISParser.quantifiedInPredicate_return quantifiedInPredicate76 = null;
+        CMISParser.quantifiedInPredicate_return quantifiedInPredicate79 = null;
 
-        CMISParser.textSearchPredicate_return textSearchPredicate77 = null;
+        CMISParser.textSearchPredicate_return textSearchPredicate80 = null;
 
-        CMISParser.folderPredicate_return folderPredicate78 = null;
+        CMISParser.folderPredicate_return folderPredicate81 = null;
 
 
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:310:2: ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate )
-            int alt26=8;
-            alt26 = dfa26.predict(input);
-            switch (alt26) {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:464:2: ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate )
+            int alt28=8;
+            alt28 = dfa28.predict(input);
+            switch (alt28) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:310:4: comparisonPredicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:464:4: comparisonPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_comparisonPredicate_in_predicate1059);
-                    comparisonPredicate71=comparisonPredicate();
+                    pushFollow(FOLLOW_comparisonPredicate_in_predicate1313);
+                    comparisonPredicate74=comparisonPredicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, comparisonPredicate71.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, comparisonPredicate74.getTree());
 
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:311:4: inPredicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:465:4: inPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_inPredicate_in_predicate1064);
-                    inPredicate72=inPredicate();
+                    pushFollow(FOLLOW_inPredicate_in_predicate1318);
+                    inPredicate75=inPredicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, inPredicate72.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, inPredicate75.getTree());
 
                     }
                     break;
                 case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:312:4: likePredicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:466:4: likePredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_likePredicate_in_predicate1069);
-                    likePredicate73=likePredicate();
+                    pushFollow(FOLLOW_likePredicate_in_predicate1323);
+                    likePredicate76=likePredicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, likePredicate73.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, likePredicate76.getTree());
 
                     }
                     break;
                 case 4 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313:4: nullPredicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:467:4: nullPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_nullPredicate_in_predicate1074);
-                    nullPredicate74=nullPredicate();
+                    pushFollow(FOLLOW_nullPredicate_in_predicate1328);
+                    nullPredicate77=nullPredicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, nullPredicate74.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, nullPredicate77.getTree());
 
                     }
                     break;
                 case 5 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:10: quantifiedComparisonPredicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:468:10: quantifiedComparisonPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_quantifiedComparisonPredicate_in_predicate1085);
-                    quantifiedComparisonPredicate75=quantifiedComparisonPredicate();
+                    pushFollow(FOLLOW_quantifiedComparisonPredicate_in_predicate1339);
+                    quantifiedComparisonPredicate78=quantifiedComparisonPredicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, quantifiedComparisonPredicate75.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, quantifiedComparisonPredicate78.getTree());
 
                     }
                     break;
                 case 6 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:315:4: quantifiedInPredicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:469:4: quantifiedInPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_quantifiedInPredicate_in_predicate1090);
-                    quantifiedInPredicate76=quantifiedInPredicate();
+                    pushFollow(FOLLOW_quantifiedInPredicate_in_predicate1344);
+                    quantifiedInPredicate79=quantifiedInPredicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, quantifiedInPredicate76.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, quantifiedInPredicate79.getTree());
 
                     }
                     break;
                 case 7 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:316:4: textSearchPredicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:470:4: textSearchPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_textSearchPredicate_in_predicate1095);
-                    textSearchPredicate77=textSearchPredicate();
+                    pushFollow(FOLLOW_textSearchPredicate_in_predicate1349);
+                    textSearchPredicate80=textSearchPredicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, textSearchPredicate77.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, textSearchPredicate80.getTree());
 
                     }
                     break;
                 case 8 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:317:4: folderPredicate
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:471:4: folderPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_folderPredicate_in_predicate1100);
-                    folderPredicate78=folderPredicate();
+                    pushFollow(FOLLOW_folderPredicate_in_predicate1354);
+                    folderPredicate81=folderPredicate();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, folderPredicate78.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, folderPredicate81.getTree());
 
                     }
                     break;
@@ -3255,10 +3368,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -3271,49 +3384,49 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "comparisonPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:1: comparisonPredicate : valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:474:1: comparisonPredicate : valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName ) ;
     public final CMISParser.comparisonPredicate_return comparisonPredicate() throws RecognitionException {
         CMISParser.comparisonPredicate_return retval = new CMISParser.comparisonPredicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.valueExpression_return valueExpression79 = null;
+        CMISParser.valueExpression_return valueExpression82 = null;
 
-        CMISParser.compOp_return compOp80 = null;
+        CMISParser.compOp_return compOp83 = null;
 
-        CMISParser.literalOrParameterName_return literalOrParameterName81 = null;
+        CMISParser.literalOrParameterName_return literalOrParameterName84 = null;
 
 
         RewriteRuleSubtreeStream stream_valueExpression=new RewriteRuleSubtreeStream(adaptor,"rule valueExpression");
         RewriteRuleSubtreeStream stream_compOp=new RewriteRuleSubtreeStream(adaptor,"rule compOp");
         RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:321:2: ( valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:321:4: valueExpression compOp literalOrParameterName
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:475:2: ( valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:475:4: valueExpression compOp literalOrParameterName
             {
-            pushFollow(FOLLOW_valueExpression_in_comparisonPredicate1112);
-            valueExpression79=valueExpression();
+            pushFollow(FOLLOW_valueExpression_in_comparisonPredicate1366);
+            valueExpression82=valueExpression();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_valueExpression.add(valueExpression79.getTree());
-            pushFollow(FOLLOW_compOp_in_comparisonPredicate1114);
-            compOp80=compOp();
+            if ( state.backtracking==0 ) stream_valueExpression.add(valueExpression82.getTree());
+            pushFollow(FOLLOW_compOp_in_comparisonPredicate1368);
+            compOp83=compOp();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_compOp.add(compOp80.getTree());
-            pushFollow(FOLLOW_literalOrParameterName_in_comparisonPredicate1116);
-            literalOrParameterName81=literalOrParameterName();
+            if ( state.backtracking==0 ) stream_compOp.add(compOp83.getTree());
+            pushFollow(FOLLOW_literalOrParameterName_in_comparisonPredicate1370);
+            literalOrParameterName84=literalOrParameterName();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName81.getTree());
+            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName84.getTree());
 
 
             // AST REWRITE
-            // elements: valueExpression, literalOrParameterName, compOp
+            // elements: compOp, valueExpression, literalOrParameterName
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3324,9 +3437,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 322:3: -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName )
+            // 476:3: -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:322:6: ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:476:6: ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_COMPARISON, "PRED_COMPARISON"), root_1);
@@ -3353,10 +3466,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -3369,27 +3482,27 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "compOp"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:325:1: compOp : ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:479:1: compOp : ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS );
     public final CMISParser.compOp_return compOp() throws RecognitionException {
         CMISParser.compOp_return retval = new CMISParser.compOp_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token set82=null;
+        Token set85=null;
 
-        Object set82_tree=null;
+        Object set85_tree=null;
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:326:2: ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:480:2: ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS )
             // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
             {
             root_0 = (Object)adaptor.nil();
 
-            set82=(Token)input.LT(1);
+            set85=(Token)input.LT(1);
             if ( input.LA(1)==EQUALS||(input.LA(1)>=NOTEQUALS && input.LA(1)<=GREATERTHANOREQUALS) ) {
                 input.consume();
-                if ( state.backtracking==0 ) adaptor.addChild(root_0, (Object)adaptor.create(set82));
+                if ( state.backtracking==0 ) adaptor.addChild(root_0, (Object)adaptor.create(set85));
                 state.errorRecovery=false;state.failed=false;
             }
             else {
@@ -3410,10 +3523,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -3426,54 +3539,54 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "literalOrParameterName"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:334:1: literalOrParameterName : ( literal | {...}? => parameterName );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:488:1: literalOrParameterName : ( literal | {...}? => parameterName );
     public final CMISParser.literalOrParameterName_return literalOrParameterName() throws RecognitionException {
         CMISParser.literalOrParameterName_return retval = new CMISParser.literalOrParameterName_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.literal_return literal83 = null;
+        CMISParser.literal_return literal86 = null;
 
-        CMISParser.parameterName_return parameterName84 = null;
+        CMISParser.parameterName_return parameterName87 = null;
 
 
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:335:2: ( literal | {...}? => parameterName )
-            int alt27=2;
-            int LA27_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:489:2: ( literal | {...}? => parameterName )
+            int alt29=2;
+            int LA29_0 = input.LA(1);
 
-            if ( (LA27_0==QUOTED_STRING||(LA27_0>=FLOATING_POINT_LITERAL && LA27_0<=TIMESTAMP)) ) {
-                alt27=1;
+            if ( (LA29_0==QUOTED_STRING||(LA29_0>=FLOATING_POINT_LITERAL && LA29_0<=TIMESTAMP)) ) {
+                alt29=1;
             }
-            else if ( (LA27_0==COLON) && ((strict == false))) {
-                alt27=2;
+            else if ( (LA29_0==COLON) && ((strict == false))) {
+                alt29=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 27, 0, input);
+                    new NoViableAltException("", 29, 0, input);
 
                 throw nvae;
             }
-            switch (alt27) {
+            switch (alt29) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:335:4: literal
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:489:4: literal
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_literal_in_literalOrParameterName1182);
-                    literal83=literal();
+                    pushFollow(FOLLOW_literal_in_literalOrParameterName1436);
+                    literal86=literal();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, literal83.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, literal86.getTree());
 
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:336:4: {...}? => parameterName
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:490:4: {...}? => parameterName
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3481,12 +3594,12 @@ public class CMISParser extends Parser {
                         if (state.backtracking>0) {state.failed=true; return retval;}
                         throw new FailedPredicateException(input, "literalOrParameterName", "strict == false");
                     }
-                    pushFollow(FOLLOW_parameterName_in_literalOrParameterName1190);
-                    parameterName84=parameterName();
+                    pushFollow(FOLLOW_parameterName_in_literalOrParameterName1444);
+                    parameterName87=parameterName();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, parameterName84.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, parameterName87.getTree());
 
                     }
                     break;
@@ -3501,10 +3614,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -3517,111 +3630,111 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "literal"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:339:1: literal : ( signedNumericLiteral | characterStringLiteral | booleanLiteral | datetimeLiteral );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:493:1: literal : ( signedNumericLiteral | characterStringLiteral | booleanLiteral | datetimeLiteral );
     public final CMISParser.literal_return literal() throws RecognitionException {
         CMISParser.literal_return retval = new CMISParser.literal_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.signedNumericLiteral_return signedNumericLiteral85 = null;
+        CMISParser.signedNumericLiteral_return signedNumericLiteral88 = null;
 
-        CMISParser.characterStringLiteral_return characterStringLiteral86 = null;
+        CMISParser.characterStringLiteral_return characterStringLiteral89 = null;
 
-        CMISParser.booleanLiteral_return booleanLiteral87 = null;
+        CMISParser.booleanLiteral_return booleanLiteral90 = null;
 
-        CMISParser.datetimeLiteral_return datetimeLiteral88 = null;
+        CMISParser.datetimeLiteral_return datetimeLiteral91 = null;
 
 
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:340:2: ( signedNumericLiteral | characterStringLiteral | booleanLiteral | datetimeLiteral )
-            int alt28=4;
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:494:2: ( signedNumericLiteral | characterStringLiteral | booleanLiteral | datetimeLiteral )
+            int alt30=4;
             switch ( input.LA(1) ) {
             case FLOATING_POINT_LITERAL:
             case DECIMAL_INTEGER_LITERAL:
                 {
-                alt28=1;
+                alt30=1;
                 }
                 break;
             case QUOTED_STRING:
                 {
-                alt28=2;
+                alt30=2;
                 }
                 break;
             case TRUE:
             case FALSE:
                 {
-                alt28=3;
+                alt30=3;
                 }
                 break;
             case TIMESTAMP:
                 {
-                alt28=4;
+                alt30=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 28, 0, input);
+                    new NoViableAltException("", 30, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt28) {
+            switch (alt30) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:340:4: signedNumericLiteral
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:494:4: signedNumericLiteral
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_signedNumericLiteral_in_literal1203);
-                    signedNumericLiteral85=signedNumericLiteral();
+                    pushFollow(FOLLOW_signedNumericLiteral_in_literal1457);
+                    signedNumericLiteral88=signedNumericLiteral();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, signedNumericLiteral85.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, signedNumericLiteral88.getTree());
 
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:341:4: characterStringLiteral
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:495:4: characterStringLiteral
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_characterStringLiteral_in_literal1208);
-                    characterStringLiteral86=characterStringLiteral();
+                    pushFollow(FOLLOW_characterStringLiteral_in_literal1462);
+                    characterStringLiteral89=characterStringLiteral();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, characterStringLiteral86.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, characterStringLiteral89.getTree());
 
                     }
                     break;
                 case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:342:4: booleanLiteral
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:496:4: booleanLiteral
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_booleanLiteral_in_literal1213);
-                    booleanLiteral87=booleanLiteral();
+                    pushFollow(FOLLOW_booleanLiteral_in_literal1467);
+                    booleanLiteral90=booleanLiteral();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, booleanLiteral87.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, booleanLiteral90.getTree());
 
                     }
                     break;
                 case 4 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:343:4: datetimeLiteral
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:497:4: datetimeLiteral
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_datetimeLiteral_in_literal1218);
-                    datetimeLiteral88=datetimeLiteral();
+                    pushFollow(FOLLOW_datetimeLiteral_in_literal1472);
+                    datetimeLiteral91=datetimeLiteral();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, datetimeLiteral88.getTree());
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, datetimeLiteral91.getTree());
 
                     }
                     break;
@@ -3636,10 +3749,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -3652,26 +3765,26 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "inPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:346:1: inPredicate : columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:500:1: inPredicate : columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) ;
     public final CMISParser.inPredicate_return inPredicate() throws RecognitionException {
         CMISParser.inPredicate_return retval = new CMISParser.inPredicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token NOT90=null;
-        Token IN91=null;
-        Token LPAREN92=null;
-        Token RPAREN94=null;
-        CMISParser.columnReference_return columnReference89 = null;
+        Token NOT93=null;
+        Token IN94=null;
+        Token LPAREN95=null;
+        Token RPAREN97=null;
+        CMISParser.columnReference_return columnReference92 = null;
 
-        CMISParser.inValueList_return inValueList93 = null;
+        CMISParser.inValueList_return inValueList96 = null;
 
 
-        Object NOT90_tree=null;
-        Object IN91_tree=null;
-        Object LPAREN92_tree=null;
-        Object RPAREN94_tree=null;
+        Object NOT93_tree=null;
+        Object IN94_tree=null;
+        Object LPAREN95_tree=null;
+        Object RPAREN97_tree=null;
         RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
         RewriteRuleTokenStream stream_IN=new RewriteRuleTokenStream(adaptor,"token IN");
         RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
@@ -3679,28 +3792,28 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         RewriteRuleSubtreeStream stream_inValueList=new RewriteRuleSubtreeStream(adaptor,"rule inValueList");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:347:2: ( columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:347:4: columnReference ( NOT )? IN LPAREN inValueList RPAREN
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:501:2: ( columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:501:4: columnReference ( NOT )? IN LPAREN inValueList RPAREN
             {
-            pushFollow(FOLLOW_columnReference_in_inPredicate1230);
-            columnReference89=columnReference();
+            pushFollow(FOLLOW_columnReference_in_inPredicate1484);
+            columnReference92=columnReference();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnReference.add(columnReference89.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:347:20: ( NOT )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            if ( state.backtracking==0 ) stream_columnReference.add(columnReference92.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:501:20: ( NOT )?
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( (LA29_0==NOT) ) {
-                alt29=1;
+            if ( (LA31_0==NOT) ) {
+                alt31=1;
             }
-            switch (alt29) {
+            switch (alt31) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:347:20: NOT
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:501:20: NOT
                     {
-                    NOT90=(Token)match(input,NOT,FOLLOW_NOT_in_inPredicate1232); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT90);
+                    NOT93=(Token)match(input,NOT,FOLLOW_NOT_in_inPredicate1486); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_NOT.add(NOT93);
 
 
                     }
@@ -3708,25 +3821,25 @@ public class CMISParser extends Parser {
 
             }
 
-            IN91=(Token)match(input,IN,FOLLOW_IN_in_inPredicate1235); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_IN.add(IN91);
+            IN94=(Token)match(input,IN,FOLLOW_IN_in_inPredicate1489); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_IN.add(IN94);
 
-            LPAREN92=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_inPredicate1237); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN92);
+            LPAREN95=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_inPredicate1491); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN95);
 
-            pushFollow(FOLLOW_inValueList_in_inPredicate1239);
-            inValueList93=inValueList();
+            pushFollow(FOLLOW_inValueList_in_inPredicate1493);
+            inValueList96=inValueList();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_inValueList.add(inValueList93.getTree());
-            RPAREN94=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_inPredicate1241); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN94);
+            if ( state.backtracking==0 ) stream_inValueList.add(inValueList96.getTree());
+            RPAREN97=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_inPredicate1495); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN97);
 
 
 
             // AST REWRITE
-            // elements: NOT, inValueList, columnReference
+            // elements: NOT, columnReference, inValueList
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3737,9 +3850,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 348:3: -> ^( PRED_IN ANY columnReference inValueList ( NOT )? )
+            // 502:3: -> ^( PRED_IN ANY columnReference inValueList ( NOT )? )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:348:6: ^( PRED_IN ANY columnReference inValueList ( NOT )? )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:502:6: ^( PRED_IN ANY columnReference inValueList ( NOT )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_IN, "PRED_IN"), root_1);
@@ -3747,7 +3860,7 @@ public class CMISParser extends Parser {
                 adaptor.addChild(root_1, (Object)adaptor.create(ANY, "ANY"));
                 adaptor.addChild(root_1, stream_columnReference.nextTree());
                 adaptor.addChild(root_1, stream_inValueList.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:348:48: ( NOT )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:502:48: ( NOT )?
                 if ( stream_NOT.hasNext() ) {
                     adaptor.addChild(root_1, stream_NOT.nextNode());
 
@@ -3771,10 +3884,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -3787,62 +3900,62 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "inValueList"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:351:1: inValueList : literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:505:1: inValueList : literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) ;
     public final CMISParser.inValueList_return inValueList() throws RecognitionException {
         CMISParser.inValueList_return retval = new CMISParser.inValueList_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token COMMA96=null;
-        CMISParser.literalOrParameterName_return literalOrParameterName95 = null;
+        Token COMMA99=null;
+        CMISParser.literalOrParameterName_return literalOrParameterName98 = null;
 
-        CMISParser.literalOrParameterName_return literalOrParameterName97 = null;
+        CMISParser.literalOrParameterName_return literalOrParameterName100 = null;
 
 
-        Object COMMA96_tree=null;
+        Object COMMA99_tree=null;
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352:2: ( literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352:4: literalOrParameterName ( COMMA literalOrParameterName )*
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:506:2: ( literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:506:4: literalOrParameterName ( COMMA literalOrParameterName )*
             {
-            pushFollow(FOLLOW_literalOrParameterName_in_inValueList1270);
-            literalOrParameterName95=literalOrParameterName();
+            pushFollow(FOLLOW_literalOrParameterName_in_inValueList1524);
+            literalOrParameterName98=literalOrParameterName();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName95.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352:27: ( COMMA literalOrParameterName )*
-            loop30:
+            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName98.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:506:27: ( COMMA literalOrParameterName )*
+            loop32:
             do {
-                int alt30=2;
-                int LA30_0 = input.LA(1);
+                int alt32=2;
+                int LA32_0 = input.LA(1);
 
-                if ( (LA30_0==COMMA) ) {
-                    alt30=1;
+                if ( (LA32_0==COMMA) ) {
+                    alt32=1;
                 }
 
 
-                switch (alt30) {
+                switch (alt32) {
             	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352:28: COMMA literalOrParameterName
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:506:28: COMMA literalOrParameterName
             	    {
-            	    COMMA96=(Token)match(input,COMMA,FOLLOW_COMMA_in_inValueList1273); if (state.failed) return retval; 
-            	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA96);
+            	    COMMA99=(Token)match(input,COMMA,FOLLOW_COMMA_in_inValueList1527); if (state.failed) return retval; 
+            	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA99);
 
-            	    pushFollow(FOLLOW_literalOrParameterName_in_inValueList1275);
-            	    literalOrParameterName97=literalOrParameterName();
+            	    pushFollow(FOLLOW_literalOrParameterName_in_inValueList1529);
+            	    literalOrParameterName100=literalOrParameterName();
 
             	    state._fsp--;
             	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName97.getTree());
+            	    if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName100.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop30;
+            	    break loop32;
                 }
             } while (true);
 
@@ -3860,9 +3973,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 353:3: -> ^( LIST ( literalOrParameterName )+ )
+            // 507:3: -> ^( LIST ( literalOrParameterName )+ )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:6: ^( LIST ( literalOrParameterName )+ )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:507:6: ^( LIST ( literalOrParameterName )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(LIST, "LIST"), root_1);
@@ -3893,10 +4006,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -3909,49 +4022,49 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "likePredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:356:1: likePredicate : columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:510:1: likePredicate : columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) ;
     public final CMISParser.likePredicate_return likePredicate() throws RecognitionException {
         CMISParser.likePredicate_return retval = new CMISParser.likePredicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token NOT99=null;
-        Token LIKE100=null;
-        CMISParser.columnReference_return columnReference98 = null;
+        Token NOT102=null;
+        Token LIKE103=null;
+        CMISParser.columnReference_return columnReference101 = null;
 
-        CMISParser.characterStringLiteral_return characterStringLiteral101 = null;
+        CMISParser.characterStringLiteral_return characterStringLiteral104 = null;
 
 
-        Object NOT99_tree=null;
-        Object LIKE100_tree=null;
+        Object NOT102_tree=null;
+        Object LIKE103_tree=null;
         RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
         RewriteRuleTokenStream stream_LIKE=new RewriteRuleTokenStream(adaptor,"token LIKE");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         RewriteRuleSubtreeStream stream_characterStringLiteral=new RewriteRuleSubtreeStream(adaptor,"rule characterStringLiteral");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:357:2: ( columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:357:4: columnReference ( NOT )? LIKE characterStringLiteral
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:511:2: ( columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:511:4: columnReference ( NOT )? LIKE characterStringLiteral
             {
-            pushFollow(FOLLOW_columnReference_in_likePredicate1301);
-            columnReference98=columnReference();
+            pushFollow(FOLLOW_columnReference_in_likePredicate1555);
+            columnReference101=columnReference();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnReference.add(columnReference98.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:357:20: ( NOT )?
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            if ( state.backtracking==0 ) stream_columnReference.add(columnReference101.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:511:20: ( NOT )?
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( (LA31_0==NOT) ) {
-                alt31=1;
+            if ( (LA33_0==NOT) ) {
+                alt33=1;
             }
-            switch (alt31) {
+            switch (alt33) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:357:20: NOT
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:511:20: NOT
                     {
-                    NOT99=(Token)match(input,NOT,FOLLOW_NOT_in_likePredicate1303); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT99);
+                    NOT102=(Token)match(input,NOT,FOLLOW_NOT_in_likePredicate1557); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_NOT.add(NOT102);
 
 
                     }
@@ -3959,15 +4072,15 @@ public class CMISParser extends Parser {
 
             }
 
-            LIKE100=(Token)match(input,LIKE,FOLLOW_LIKE_in_likePredicate1306); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LIKE.add(LIKE100);
+            LIKE103=(Token)match(input,LIKE,FOLLOW_LIKE_in_likePredicate1560); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_LIKE.add(LIKE103);
 
-            pushFollow(FOLLOW_characterStringLiteral_in_likePredicate1308);
-            characterStringLiteral101=characterStringLiteral();
+            pushFollow(FOLLOW_characterStringLiteral_in_likePredicate1562);
+            characterStringLiteral104=characterStringLiteral();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_characterStringLiteral.add(characterStringLiteral101.getTree());
+            if ( state.backtracking==0 ) stream_characterStringLiteral.add(characterStringLiteral104.getTree());
 
 
             // AST REWRITE
@@ -3982,16 +4095,16 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 358:3: -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? )
+            // 512:3: -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:358:6: ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:512:6: ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_LIKE, "PRED_LIKE"), root_1);
 
                 adaptor.addChild(root_1, stream_columnReference.nextTree());
                 adaptor.addChild(root_1, stream_characterStringLiteral.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:358:57: ( NOT )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:512:57: ( NOT )?
                 if ( stream_NOT.hasNext() ) {
                     adaptor.addChild(root_1, stream_NOT.nextNode());
 
@@ -4015,10 +4128,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -4031,173 +4144,81 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "nullPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:361:1: nullPredicate : ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:515:1: nullPredicate : ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) );
     public final CMISParser.nullPredicate_return nullPredicate() throws RecognitionException {
         CMISParser.nullPredicate_return retval = new CMISParser.nullPredicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token IS104=null;
-        Token NULL105=null;
-        Token IS108=null;
-        Token NOT109=null;
-        Token NULL110=null;
-        CMISParser.columnReference_return columnReference102 = null;
+        Token IS107=null;
+        Token NULL108=null;
+        Token IS111=null;
+        Token NOT112=null;
+        Token NULL113=null;
+        CMISParser.columnReference_return columnReference105 = null;
 
-        CMISParser.multiValuedColumnReference_return multiValuedColumnReference103 = null;
+        CMISParser.multiValuedColumnReference_return multiValuedColumnReference106 = null;
 
-        CMISParser.columnReference_return columnReference106 = null;
+        CMISParser.columnReference_return columnReference109 = null;
 
-        CMISParser.multiValuedColumnReference_return multiValuedColumnReference107 = null;
+        CMISParser.multiValuedColumnReference_return multiValuedColumnReference110 = null;
 
 
-        Object IS104_tree=null;
-        Object NULL105_tree=null;
-        Object IS108_tree=null;
-        Object NOT109_tree=null;
-        Object NULL110_tree=null;
+        Object IS107_tree=null;
+        Object NULL108_tree=null;
+        Object IS111_tree=null;
+        Object NOT112_tree=null;
+        Object NULL113_tree=null;
         RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
         RewriteRuleTokenStream stream_IS=new RewriteRuleTokenStream(adaptor,"token IS");
         RewriteRuleTokenStream stream_NULL=new RewriteRuleTokenStream(adaptor,"token NULL");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         RewriteRuleSubtreeStream stream_multiValuedColumnReference=new RewriteRuleSubtreeStream(adaptor,"rule multiValuedColumnReference");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:362:2: ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) )
-            int alt34=2;
-            alt34 = dfa34.predict(input);
-            switch (alt34) {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:2: ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) )
+            int alt36=2;
+            alt36 = dfa36.predict(input);
+            switch (alt36) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:362:4: ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:4: ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL
                     {
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:362:4: ( ( columnReference )=> columnReference | multiValuedColumnReference )
-                    int alt32=2;
-                    int LA32_0 = input.LA(1);
-
-                    if ( (LA32_0==ID) ) {
-                        int LA32_1 = input.LA(2);
-
-                        if ( (synpred5_CMIS()) ) {
-                            alt32=1;
-                        }
-                        else if ( (true) ) {
-                            alt32=2;
-                        }
-                        else {
-                            if (state.backtracking>0) {state.failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("", 32, 1, input);
-
-                            throw nvae;
-                        }
-                    }
-                    else if ( (LA32_0==DOUBLE_QUOTE) && ((strict == false))) {
-                        int LA32_2 = input.LA(2);
-
-                        if ( (LA32_2==SELECT||LA32_2==AS||(LA32_2>=FROM && LA32_2<=ON)||(LA32_2>=WHERE && LA32_2<=NOT)||(LA32_2>=IN && LA32_2<=DESC)||(LA32_2>=TRUE && LA32_2<=TIMESTAMP)) && ((strict == false))) {
-                            int LA32_5 = input.LA(3);
-
-                            if ( (LA32_5==DOUBLE_QUOTE) && ((strict == false))) {
-                                int LA32_7 = input.LA(4);
-
-                                if ( (((synpred5_CMIS()&&(strict == false))||(synpred5_CMIS()&&(strict == false))||(synpred5_CMIS()&&(strict == false)))) ) {
-                                    alt32=1;
-                                }
-                                else if ( ((strict == false)) ) {
-                                    alt32=2;
-                                }
-                                else {
-                                    if (state.backtracking>0) {state.failed=true; return retval;}
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("", 32, 7, input);
-
-                                    throw nvae;
-                                }
-                            }
-                            else {
-                                if (state.backtracking>0) {state.failed=true; return retval;}
-                                NoViableAltException nvae =
-                                    new NoViableAltException("", 32, 5, input);
-
-                                throw nvae;
-                            }
-                        }
-                        else if ( (LA32_2==ID) && ((strict == false))) {
-                            int LA32_6 = input.LA(3);
-
-                            if ( (LA32_6==DOUBLE_QUOTE) && ((strict == false))) {
-                                int LA32_8 = input.LA(4);
-
-                                if ( (((synpred5_CMIS()&&(strict == false))||(synpred5_CMIS()&&(strict == false))||(synpred5_CMIS()&&(strict == false)))) ) {
-                                    alt32=1;
-                                }
-                                else if ( ((strict == false)) ) {
-                                    alt32=2;
-                                }
-                                else {
-                                    if (state.backtracking>0) {state.failed=true; return retval;}
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("", 32, 8, input);
-
-                                    throw nvae;
-                                }
-                            }
-                            else {
-                                if (state.backtracking>0) {state.failed=true; return retval;}
-                                NoViableAltException nvae =
-                                    new NoViableAltException("", 32, 6, input);
-
-                                throw nvae;
-                            }
-                        }
-                        else {
-                            if (state.backtracking>0) {state.failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("", 32, 2, input);
-
-                            throw nvae;
-                        }
-                    }
-                    else {
-                        if (state.backtracking>0) {state.failed=true; return retval;}
-                        NoViableAltException nvae =
-                            new NoViableAltException("", 32, 0, input);
-
-                        throw nvae;
-                    }
-                    switch (alt32) {
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:4: ( ( columnReference )=> columnReference | multiValuedColumnReference )
+                    int alt34=2;
+                    alt34 = dfa34.predict(input);
+                    switch (alt34) {
                         case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:362:6: ( columnReference )=> columnReference
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:6: ( columnReference )=> columnReference
                             {
-                            pushFollow(FOLLOW_columnReference_in_nullPredicate1342);
-                            columnReference102=columnReference();
+                            pushFollow(FOLLOW_columnReference_in_nullPredicate1596);
+                            columnReference105=columnReference();
 
                             state._fsp--;
                             if (state.failed) return retval;
-                            if ( state.backtracking==0 ) stream_columnReference.add(columnReference102.getTree());
+                            if ( state.backtracking==0 ) stream_columnReference.add(columnReference105.getTree());
 
                             }
                             break;
                         case 2 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:362:44: multiValuedColumnReference
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:44: multiValuedColumnReference
                             {
-                            pushFollow(FOLLOW_multiValuedColumnReference_in_nullPredicate1346);
-                            multiValuedColumnReference103=multiValuedColumnReference();
+                            pushFollow(FOLLOW_multiValuedColumnReference_in_nullPredicate1600);
+                            multiValuedColumnReference106=multiValuedColumnReference();
 
                             state._fsp--;
                             if (state.failed) return retval;
-                            if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference103.getTree());
+                            if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference106.getTree());
 
                             }
                             break;
 
                     }
 
-                    IS104=(Token)match(input,IS,FOLLOW_IS_in_nullPredicate1349); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_IS.add(IS104);
+                    IS107=(Token)match(input,IS,FOLLOW_IS_in_nullPredicate1603); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_IS.add(IS107);
 
-                    NULL105=(Token)match(input,NULL,FOLLOW_NULL_in_nullPredicate1351); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NULL.add(NULL105);
+                    NULL108=(Token)match(input,NULL,FOLLOW_NULL_in_nullPredicate1605); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_NULL.add(NULL108);
 
 
 
@@ -4213,9 +4234,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 363:3: -> ^( PRED_EXISTS columnReference NOT )
+                    // 517:3: -> ^( PRED_EXISTS columnReference NOT )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:363:6: ^( PRED_EXISTS columnReference NOT )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:517:6: ^( PRED_EXISTS columnReference NOT )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_EXISTS, "PRED_EXISTS"), root_1);
@@ -4232,139 +4253,47 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:9: ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:9: ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL
                     {
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:9: ( ( columnReference )=> columnReference | multiValuedColumnReference )
-                    int alt33=2;
-                    int LA33_0 = input.LA(1);
-
-                    if ( (LA33_0==ID) ) {
-                        int LA33_1 = input.LA(2);
-
-                        if ( (synpred6_CMIS()) ) {
-                            alt33=1;
-                        }
-                        else if ( (true) ) {
-                            alt33=2;
-                        }
-                        else {
-                            if (state.backtracking>0) {state.failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("", 33, 1, input);
-
-                            throw nvae;
-                        }
-                    }
-                    else if ( (LA33_0==DOUBLE_QUOTE) && ((strict == false))) {
-                        int LA33_2 = input.LA(2);
-
-                        if ( (LA33_2==SELECT||LA33_2==AS||(LA33_2>=FROM && LA33_2<=ON)||(LA33_2>=WHERE && LA33_2<=NOT)||(LA33_2>=IN && LA33_2<=DESC)||(LA33_2>=TRUE && LA33_2<=TIMESTAMP)) && ((strict == false))) {
-                            int LA33_5 = input.LA(3);
-
-                            if ( (LA33_5==DOUBLE_QUOTE) && ((strict == false))) {
-                                int LA33_7 = input.LA(4);
-
-                                if ( (((synpred6_CMIS()&&(strict == false))||(synpred6_CMIS()&&(strict == false))||(synpred6_CMIS()&&(strict == false)))) ) {
-                                    alt33=1;
-                                }
-                                else if ( ((strict == false)) ) {
-                                    alt33=2;
-                                }
-                                else {
-                                    if (state.backtracking>0) {state.failed=true; return retval;}
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("", 33, 7, input);
-
-                                    throw nvae;
-                                }
-                            }
-                            else {
-                                if (state.backtracking>0) {state.failed=true; return retval;}
-                                NoViableAltException nvae =
-                                    new NoViableAltException("", 33, 5, input);
-
-                                throw nvae;
-                            }
-                        }
-                        else if ( (LA33_2==ID) && ((strict == false))) {
-                            int LA33_6 = input.LA(3);
-
-                            if ( (LA33_6==DOUBLE_QUOTE) && ((strict == false))) {
-                                int LA33_8 = input.LA(4);
-
-                                if ( (((synpred6_CMIS()&&(strict == false))||(synpred6_CMIS()&&(strict == false))||(synpred6_CMIS()&&(strict == false)))) ) {
-                                    alt33=1;
-                                }
-                                else if ( ((strict == false)) ) {
-                                    alt33=2;
-                                }
-                                else {
-                                    if (state.backtracking>0) {state.failed=true; return retval;}
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("", 33, 8, input);
-
-                                    throw nvae;
-                                }
-                            }
-                            else {
-                                if (state.backtracking>0) {state.failed=true; return retval;}
-                                NoViableAltException nvae =
-                                    new NoViableAltException("", 33, 6, input);
-
-                                throw nvae;
-                            }
-                        }
-                        else {
-                            if (state.backtracking>0) {state.failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("", 33, 2, input);
-
-                            throw nvae;
-                        }
-                    }
-                    else {
-                        if (state.backtracking>0) {state.failed=true; return retval;}
-                        NoViableAltException nvae =
-                            new NoViableAltException("", 33, 0, input);
-
-                        throw nvae;
-                    }
-                    switch (alt33) {
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:9: ( ( columnReference )=> columnReference | multiValuedColumnReference )
+                    int alt35=2;
+                    alt35 = dfa35.predict(input);
+                    switch (alt35) {
                         case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:11: ( columnReference )=> columnReference
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:11: ( columnReference )=> columnReference
                             {
-                            pushFollow(FOLLOW_columnReference_in_nullPredicate1380);
-                            columnReference106=columnReference();
+                            pushFollow(FOLLOW_columnReference_in_nullPredicate1634);
+                            columnReference109=columnReference();
 
                             state._fsp--;
                             if (state.failed) return retval;
-                            if ( state.backtracking==0 ) stream_columnReference.add(columnReference106.getTree());
+                            if ( state.backtracking==0 ) stream_columnReference.add(columnReference109.getTree());
 
                             }
                             break;
                         case 2 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:49: multiValuedColumnReference
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:49: multiValuedColumnReference
                             {
-                            pushFollow(FOLLOW_multiValuedColumnReference_in_nullPredicate1384);
-                            multiValuedColumnReference107=multiValuedColumnReference();
+                            pushFollow(FOLLOW_multiValuedColumnReference_in_nullPredicate1638);
+                            multiValuedColumnReference110=multiValuedColumnReference();
 
                             state._fsp--;
                             if (state.failed) return retval;
-                            if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference107.getTree());
+                            if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference110.getTree());
 
                             }
                             break;
 
                     }
 
-                    IS108=(Token)match(input,IS,FOLLOW_IS_in_nullPredicate1387); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_IS.add(IS108);
+                    IS111=(Token)match(input,IS,FOLLOW_IS_in_nullPredicate1641); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_IS.add(IS111);
 
-                    NOT109=(Token)match(input,NOT,FOLLOW_NOT_in_nullPredicate1389); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT109);
+                    NOT112=(Token)match(input,NOT,FOLLOW_NOT_in_nullPredicate1643); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_NOT.add(NOT112);
 
-                    NULL110=(Token)match(input,NULL,FOLLOW_NULL_in_nullPredicate1391); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NULL.add(NULL110);
+                    NULL113=(Token)match(input,NULL,FOLLOW_NULL_in_nullPredicate1645); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_NULL.add(NULL113);
 
 
 
@@ -4380,9 +4309,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 365:9: -> ^( PRED_EXISTS columnReference )
+                    // 519:9: -> ^( PRED_EXISTS columnReference )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:365:12: ^( PRED_EXISTS columnReference )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:519:12: ^( PRED_EXISTS columnReference )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_EXISTS, "PRED_EXISTS"), root_1);
@@ -4408,10 +4337,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -4424,55 +4353,55 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "quantifiedComparisonPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:368:1: quantifiedComparisonPredicate : literalOrParameterName compOp ANY multiValuedColumnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:522:1: quantifiedComparisonPredicate : literalOrParameterName compOp ANY multiValuedColumnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference ) ;
     public final CMISParser.quantifiedComparisonPredicate_return quantifiedComparisonPredicate() throws RecognitionException {
         CMISParser.quantifiedComparisonPredicate_return retval = new CMISParser.quantifiedComparisonPredicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ANY113=null;
-        CMISParser.literalOrParameterName_return literalOrParameterName111 = null;
+        Token ANY116=null;
+        CMISParser.literalOrParameterName_return literalOrParameterName114 = null;
 
-        CMISParser.compOp_return compOp112 = null;
+        CMISParser.compOp_return compOp115 = null;
 
-        CMISParser.multiValuedColumnReference_return multiValuedColumnReference114 = null;
+        CMISParser.multiValuedColumnReference_return multiValuedColumnReference117 = null;
 
 
-        Object ANY113_tree=null;
+        Object ANY116_tree=null;
         RewriteRuleTokenStream stream_ANY=new RewriteRuleTokenStream(adaptor,"token ANY");
         RewriteRuleSubtreeStream stream_compOp=new RewriteRuleSubtreeStream(adaptor,"rule compOp");
         RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
         RewriteRuleSubtreeStream stream_multiValuedColumnReference=new RewriteRuleSubtreeStream(adaptor,"rule multiValuedColumnReference");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:2: ( literalOrParameterName compOp ANY multiValuedColumnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:4: literalOrParameterName compOp ANY multiValuedColumnReference
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:523:2: ( literalOrParameterName compOp ANY multiValuedColumnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:523:4: literalOrParameterName compOp ANY multiValuedColumnReference
             {
-            pushFollow(FOLLOW_literalOrParameterName_in_quantifiedComparisonPredicate1419);
-            literalOrParameterName111=literalOrParameterName();
+            pushFollow(FOLLOW_literalOrParameterName_in_quantifiedComparisonPredicate1673);
+            literalOrParameterName114=literalOrParameterName();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName111.getTree());
-            pushFollow(FOLLOW_compOp_in_quantifiedComparisonPredicate1421);
-            compOp112=compOp();
+            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName114.getTree());
+            pushFollow(FOLLOW_compOp_in_quantifiedComparisonPredicate1675);
+            compOp115=compOp();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_compOp.add(compOp112.getTree());
-            ANY113=(Token)match(input,ANY,FOLLOW_ANY_in_quantifiedComparisonPredicate1423); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_ANY.add(ANY113);
+            if ( state.backtracking==0 ) stream_compOp.add(compOp115.getTree());
+            ANY116=(Token)match(input,ANY,FOLLOW_ANY_in_quantifiedComparisonPredicate1677); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_ANY.add(ANY116);
 
-            pushFollow(FOLLOW_multiValuedColumnReference_in_quantifiedComparisonPredicate1425);
-            multiValuedColumnReference114=multiValuedColumnReference();
+            pushFollow(FOLLOW_multiValuedColumnReference_in_quantifiedComparisonPredicate1679);
+            multiValuedColumnReference117=multiValuedColumnReference();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference114.getTree());
+            if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference117.getTree());
 
 
             // AST REWRITE
-            // elements: compOp, ANY, multiValuedColumnReference, literalOrParameterName
+            // elements: multiValuedColumnReference, ANY, compOp, literalOrParameterName
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4483,9 +4412,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 370:2: -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference )
+            // 524:2: -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:370:5: ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:524:5: ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_COMPARISON, "PRED_COMPARISON"), root_1);
@@ -4512,10 +4441,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -4528,28 +4457,28 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "quantifiedInPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:374:1: quantifiedInPredicate : ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:528:1: quantifiedInPredicate : ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? ) ;
     public final CMISParser.quantifiedInPredicate_return quantifiedInPredicate() throws RecognitionException {
         CMISParser.quantifiedInPredicate_return retval = new CMISParser.quantifiedInPredicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ANY115=null;
-        Token NOT117=null;
-        Token IN118=null;
-        Token LPAREN119=null;
-        Token RPAREN121=null;
-        CMISParser.multiValuedColumnReference_return multiValuedColumnReference116 = null;
+        Token ANY118=null;
+        Token NOT120=null;
+        Token IN121=null;
+        Token LPAREN122=null;
+        Token RPAREN124=null;
+        CMISParser.multiValuedColumnReference_return multiValuedColumnReference119 = null;
 
-        CMISParser.inValueList_return inValueList120 = null;
+        CMISParser.inValueList_return inValueList123 = null;
 
 
-        Object ANY115_tree=null;
-        Object NOT117_tree=null;
-        Object IN118_tree=null;
-        Object LPAREN119_tree=null;
-        Object RPAREN121_tree=null;
+        Object ANY118_tree=null;
+        Object NOT120_tree=null;
+        Object IN121_tree=null;
+        Object LPAREN122_tree=null;
+        Object RPAREN124_tree=null;
         RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
         RewriteRuleTokenStream stream_ANY=new RewriteRuleTokenStream(adaptor,"token ANY");
         RewriteRuleTokenStream stream_IN=new RewriteRuleTokenStream(adaptor,"token IN");
@@ -4558,31 +4487,31 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_multiValuedColumnReference=new RewriteRuleSubtreeStream(adaptor,"rule multiValuedColumnReference");
         RewriteRuleSubtreeStream stream_inValueList=new RewriteRuleSubtreeStream(adaptor,"rule inValueList");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:375:2: ( ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:375:4: ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:529:2: ( ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:529:4: ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN
             {
-            ANY115=(Token)match(input,ANY,FOLLOW_ANY_in_quantifiedInPredicate1454); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_ANY.add(ANY115);
+            ANY118=(Token)match(input,ANY,FOLLOW_ANY_in_quantifiedInPredicate1708); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_ANY.add(ANY118);
 
-            pushFollow(FOLLOW_multiValuedColumnReference_in_quantifiedInPredicate1456);
-            multiValuedColumnReference116=multiValuedColumnReference();
+            pushFollow(FOLLOW_multiValuedColumnReference_in_quantifiedInPredicate1710);
+            multiValuedColumnReference119=multiValuedColumnReference();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference116.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:375:35: ( NOT )?
-            int alt35=2;
-            int LA35_0 = input.LA(1);
+            if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference119.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:529:35: ( NOT )?
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA35_0==NOT) ) {
-                alt35=1;
+            if ( (LA37_0==NOT) ) {
+                alt37=1;
             }
-            switch (alt35) {
+            switch (alt37) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:375:35: NOT
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:529:35: NOT
                     {
-                    NOT117=(Token)match(input,NOT,FOLLOW_NOT_in_quantifiedInPredicate1458); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT117);
+                    NOT120=(Token)match(input,NOT,FOLLOW_NOT_in_quantifiedInPredicate1712); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_NOT.add(NOT120);
 
 
                     }
@@ -4590,25 +4519,25 @@ public class CMISParser extends Parser {
 
             }
 
-            IN118=(Token)match(input,IN,FOLLOW_IN_in_quantifiedInPredicate1461); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_IN.add(IN118);
+            IN121=(Token)match(input,IN,FOLLOW_IN_in_quantifiedInPredicate1715); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_IN.add(IN121);
 
-            LPAREN119=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_quantifiedInPredicate1464); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN119);
+            LPAREN122=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_quantifiedInPredicate1718); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN122);
 
-            pushFollow(FOLLOW_inValueList_in_quantifiedInPredicate1466);
-            inValueList120=inValueList();
+            pushFollow(FOLLOW_inValueList_in_quantifiedInPredicate1720);
+            inValueList123=inValueList();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_inValueList.add(inValueList120.getTree());
-            RPAREN121=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_quantifiedInPredicate1468); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN121);
+            if ( state.backtracking==0 ) stream_inValueList.add(inValueList123.getTree());
+            RPAREN124=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_quantifiedInPredicate1722); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN124);
 
 
 
             // AST REWRITE
-            // elements: NOT, inValueList, multiValuedColumnReference, ANY
+            // elements: NOT, multiValuedColumnReference, inValueList, ANY
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4619,9 +4548,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 376:3: -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? )
+            // 530:3: -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:376:6: ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:530:6: ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_IN, "PRED_IN"), root_1);
@@ -4629,7 +4558,7 @@ public class CMISParser extends Parser {
                 adaptor.addChild(root_1, stream_ANY.nextNode());
                 adaptor.addChild(root_1, stream_multiValuedColumnReference.nextTree());
                 adaptor.addChild(root_1, stream_inValueList.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:376:59: ( NOT )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:530:59: ( NOT )?
                 if ( stream_NOT.hasNext() ) {
                     adaptor.addChild(root_1, stream_NOT.nextNode());
 
@@ -4653,10 +4582,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -4669,26 +4598,26 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "textSearchPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:379:1: textSearchPredicate : CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:533:1: textSearchPredicate : CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) ;
     public final CMISParser.textSearchPredicate_return textSearchPredicate() throws RecognitionException {
         CMISParser.textSearchPredicate_return retval = new CMISParser.textSearchPredicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token CONTAINS122=null;
-        Token LPAREN123=null;
-        Token COMMA125=null;
-        Token RPAREN127=null;
-        CMISParser.qualifier_return qualifier124 = null;
+        Token CONTAINS125=null;
+        Token LPAREN126=null;
+        Token COMMA128=null;
+        Token RPAREN130=null;
+        CMISParser.qualifier_return qualifier127 = null;
 
-        CMISParser.textSearchExpression_return textSearchExpression126 = null;
+        CMISParser.textSearchExpression_return textSearchExpression129 = null;
 
 
-        Object CONTAINS122_tree=null;
-        Object LPAREN123_tree=null;
-        Object COMMA125_tree=null;
-        Object RPAREN127_tree=null;
+        Object CONTAINS125_tree=null;
+        Object LPAREN126_tree=null;
+        Object COMMA128_tree=null;
+        Object RPAREN130_tree=null;
         RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleTokenStream stream_CONTAINS=new RewriteRuleTokenStream(adaptor,"token CONTAINS");
@@ -4696,37 +4625,37 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         RewriteRuleSubtreeStream stream_textSearchExpression=new RewriteRuleSubtreeStream(adaptor,"rule textSearchExpression");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:2: ( CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:4: CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:534:2: ( CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:534:4: CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN
             {
-            CONTAINS122=(Token)match(input,CONTAINS,FOLLOW_CONTAINS_in_textSearchPredicate1497); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_CONTAINS.add(CONTAINS122);
+            CONTAINS125=(Token)match(input,CONTAINS,FOLLOW_CONTAINS_in_textSearchPredicate1751); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_CONTAINS.add(CONTAINS125);
 
-            LPAREN123=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_textSearchPredicate1499); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN123);
+            LPAREN126=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_textSearchPredicate1753); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN126);
 
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:20: ( qualifier COMMA )?
-            int alt36=2;
-            int LA36_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:534:20: ( qualifier COMMA )?
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA36_0==ID) ) {
-                alt36=1;
+            if ( (LA38_0==ID) ) {
+                alt38=1;
             }
-            else if ( (LA36_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt36=1;
+            else if ( (LA38_0==DOUBLE_QUOTE) && ((strict == false))) {
+                alt38=1;
             }
-            switch (alt36) {
+            switch (alt38) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:21: qualifier COMMA
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:534:21: qualifier COMMA
                     {
-                    pushFollow(FOLLOW_qualifier_in_textSearchPredicate1502);
-                    qualifier124=qualifier();
+                    pushFollow(FOLLOW_qualifier_in_textSearchPredicate1756);
+                    qualifier127=qualifier();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier124.getTree());
-                    COMMA125=(Token)match(input,COMMA,FOLLOW_COMMA_in_textSearchPredicate1504); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_COMMA.add(COMMA125);
+                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier127.getTree());
+                    COMMA128=(Token)match(input,COMMA,FOLLOW_COMMA_in_textSearchPredicate1758); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_COMMA.add(COMMA128);
 
 
                     }
@@ -4734,19 +4663,19 @@ public class CMISParser extends Parser {
 
             }
 
-            pushFollow(FOLLOW_textSearchExpression_in_textSearchPredicate1508);
-            textSearchExpression126=textSearchExpression();
+            pushFollow(FOLLOW_textSearchExpression_in_textSearchPredicate1762);
+            textSearchExpression129=textSearchExpression();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_textSearchExpression.add(textSearchExpression126.getTree());
-            RPAREN127=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_textSearchPredicate1510); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN127);
+            if ( state.backtracking==0 ) stream_textSearchExpression.add(textSearchExpression129.getTree());
+            RPAREN130=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_textSearchPredicate1764); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN130);
 
 
 
             // AST REWRITE
-            // elements: textSearchExpression, qualifier
+            // elements: qualifier, textSearchExpression
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4757,15 +4686,15 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 381:3: -> ^( PRED_FTS textSearchExpression ( qualifier )? )
+            // 535:3: -> ^( PRED_FTS textSearchExpression ( qualifier )? )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:6: ^( PRED_FTS textSearchExpression ( qualifier )? )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:535:6: ^( PRED_FTS textSearchExpression ( qualifier )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_FTS, "PRED_FTS"), root_1);
 
                 adaptor.addChild(root_1, stream_textSearchExpression.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:38: ( qualifier )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:535:38: ( qualifier )?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_1, stream_qualifier.nextTree());
 
@@ -4789,10 +4718,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -4805,56 +4734,56 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "folderPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:384:1: folderPredicate : ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:538:1: folderPredicate : ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) );
     public final CMISParser.folderPredicate_return folderPredicate() throws RecognitionException {
         CMISParser.folderPredicate_return retval = new CMISParser.folderPredicate_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token IN_FOLDER128=null;
-        Token IN_TREE130=null;
-        CMISParser.folderPredicateArgs_return folderPredicateArgs129 = null;
+        Token IN_FOLDER131=null;
+        Token IN_TREE133=null;
+        CMISParser.folderPredicateArgs_return folderPredicateArgs132 = null;
 
-        CMISParser.folderPredicateArgs_return folderPredicateArgs131 = null;
+        CMISParser.folderPredicateArgs_return folderPredicateArgs134 = null;
 
 
-        Object IN_FOLDER128_tree=null;
-        Object IN_TREE130_tree=null;
+        Object IN_FOLDER131_tree=null;
+        Object IN_TREE133_tree=null;
         RewriteRuleTokenStream stream_IN_TREE=new RewriteRuleTokenStream(adaptor,"token IN_TREE");
         RewriteRuleTokenStream stream_IN_FOLDER=new RewriteRuleTokenStream(adaptor,"token IN_FOLDER");
         RewriteRuleSubtreeStream stream_folderPredicateArgs=new RewriteRuleSubtreeStream(adaptor,"rule folderPredicateArgs");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:385:2: ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) )
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:539:2: ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) )
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA37_0==IN_FOLDER) ) {
-                alt37=1;
+            if ( (LA39_0==IN_FOLDER) ) {
+                alt39=1;
             }
-            else if ( (LA37_0==IN_TREE) ) {
-                alt37=2;
+            else if ( (LA39_0==IN_TREE) ) {
+                alt39=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 37, 0, input);
+                    new NoViableAltException("", 39, 0, input);
 
                 throw nvae;
             }
-            switch (alt37) {
+            switch (alt39) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:385:4: IN_FOLDER folderPredicateArgs
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:539:4: IN_FOLDER folderPredicateArgs
                     {
-                    IN_FOLDER128=(Token)match(input,IN_FOLDER,FOLLOW_IN_FOLDER_in_folderPredicate1535); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_IN_FOLDER.add(IN_FOLDER128);
+                    IN_FOLDER131=(Token)match(input,IN_FOLDER,FOLLOW_IN_FOLDER_in_folderPredicate1789); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_IN_FOLDER.add(IN_FOLDER131);
 
-                    pushFollow(FOLLOW_folderPredicateArgs_in_folderPredicate1538);
-                    folderPredicateArgs129=folderPredicateArgs();
+                    pushFollow(FOLLOW_folderPredicateArgs_in_folderPredicate1792);
+                    folderPredicateArgs132=folderPredicateArgs();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_folderPredicateArgs.add(folderPredicateArgs129.getTree());
+                    if ( state.backtracking==0 ) stream_folderPredicateArgs.add(folderPredicateArgs132.getTree());
 
 
                     // AST REWRITE
@@ -4869,9 +4798,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 386:3: -> ^( PRED_CHILD folderPredicateArgs )
+                    // 540:3: -> ^( PRED_CHILD folderPredicateArgs )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:386:6: ^( PRED_CHILD folderPredicateArgs )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:540:6: ^( PRED_CHILD folderPredicateArgs )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_CHILD, "PRED_CHILD"), root_1);
@@ -4887,17 +4816,17 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:387:10: IN_TREE folderPredicateArgs
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:541:10: IN_TREE folderPredicateArgs
                     {
-                    IN_TREE130=(Token)match(input,IN_TREE,FOLLOW_IN_TREE_in_folderPredicate1559); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_IN_TREE.add(IN_TREE130);
+                    IN_TREE133=(Token)match(input,IN_TREE,FOLLOW_IN_TREE_in_folderPredicate1813); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_IN_TREE.add(IN_TREE133);
 
-                    pushFollow(FOLLOW_folderPredicateArgs_in_folderPredicate1561);
-                    folderPredicateArgs131=folderPredicateArgs();
+                    pushFollow(FOLLOW_folderPredicateArgs_in_folderPredicate1815);
+                    folderPredicateArgs134=folderPredicateArgs();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_folderPredicateArgs.add(folderPredicateArgs131.getTree());
+                    if ( state.backtracking==0 ) stream_folderPredicateArgs.add(folderPredicateArgs134.getTree());
 
 
                     // AST REWRITE
@@ -4912,9 +4841,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 388:3: -> ^( PRED_DESCENDANT folderPredicateArgs )
+                    // 542:3: -> ^( PRED_DESCENDANT folderPredicateArgs )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:6: ^( PRED_DESCENDANT folderPredicateArgs )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:542:6: ^( PRED_DESCENDANT folderPredicateArgs )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_DESCENDANT, "PRED_DESCENDANT"), root_1);
@@ -4940,10 +4869,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -4956,58 +4885,58 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "folderPredicateArgs"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:391:1: folderPredicateArgs : LPAREN ( qualifier COMMA )? folderId RPAREN -> folderId ( qualifier )? ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:545:1: folderPredicateArgs : LPAREN ( qualifier COMMA )? folderId RPAREN -> folderId ( qualifier )? ;
     public final CMISParser.folderPredicateArgs_return folderPredicateArgs() throws RecognitionException {
         CMISParser.folderPredicateArgs_return retval = new CMISParser.folderPredicateArgs_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LPAREN132=null;
-        Token COMMA134=null;
-        Token RPAREN136=null;
-        CMISParser.qualifier_return qualifier133 = null;
+        Token LPAREN135=null;
+        Token COMMA137=null;
+        Token RPAREN139=null;
+        CMISParser.qualifier_return qualifier136 = null;
 
-        CMISParser.folderId_return folderId135 = null;
+        CMISParser.folderId_return folderId138 = null;
 
 
-        Object LPAREN132_tree=null;
-        Object COMMA134_tree=null;
-        Object RPAREN136_tree=null;
+        Object LPAREN135_tree=null;
+        Object COMMA137_tree=null;
+        Object RPAREN139_tree=null;
         RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         RewriteRuleSubtreeStream stream_folderId=new RewriteRuleSubtreeStream(adaptor,"rule folderId");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:392:2: ( LPAREN ( qualifier COMMA )? folderId RPAREN -> folderId ( qualifier )? )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:392:4: LPAREN ( qualifier COMMA )? folderId RPAREN
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:2: ( LPAREN ( qualifier COMMA )? folderId RPAREN -> folderId ( qualifier )? )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:4: LPAREN ( qualifier COMMA )? folderId RPAREN
             {
-            LPAREN132=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_folderPredicateArgs1583); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN132);
+            LPAREN135=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_folderPredicateArgs1837); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN135);
 
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:392:11: ( qualifier COMMA )?
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:11: ( qualifier COMMA )?
+            int alt40=2;
+            int LA40_0 = input.LA(1);
 
-            if ( (LA38_0==ID) ) {
-                alt38=1;
+            if ( (LA40_0==ID) ) {
+                alt40=1;
             }
-            else if ( (LA38_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt38=1;
+            else if ( (LA40_0==DOUBLE_QUOTE) && ((strict == false))) {
+                alt40=1;
             }
-            switch (alt38) {
+            switch (alt40) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:392:12: qualifier COMMA
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:12: qualifier COMMA
                     {
-                    pushFollow(FOLLOW_qualifier_in_folderPredicateArgs1586);
-                    qualifier133=qualifier();
+                    pushFollow(FOLLOW_qualifier_in_folderPredicateArgs1840);
+                    qualifier136=qualifier();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier133.getTree());
-                    COMMA134=(Token)match(input,COMMA,FOLLOW_COMMA_in_folderPredicateArgs1588); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_COMMA.add(COMMA134);
+                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier136.getTree());
+                    COMMA137=(Token)match(input,COMMA,FOLLOW_COMMA_in_folderPredicateArgs1842); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_COMMA.add(COMMA137);
 
 
                     }
@@ -5015,19 +4944,19 @@ public class CMISParser extends Parser {
 
             }
 
-            pushFollow(FOLLOW_folderId_in_folderPredicateArgs1592);
-            folderId135=folderId();
+            pushFollow(FOLLOW_folderId_in_folderPredicateArgs1846);
+            folderId138=folderId();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_folderId.add(folderId135.getTree());
-            RPAREN136=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_folderPredicateArgs1594); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN136);
+            if ( state.backtracking==0 ) stream_folderId.add(folderId138.getTree());
+            RPAREN139=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_folderPredicateArgs1848); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN139);
 
 
 
             // AST REWRITE
-            // elements: qualifier, folderId
+            // elements: folderId, qualifier
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -5038,10 +4967,10 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 393:3: -> folderId ( qualifier )?
+            // 547:3: -> folderId ( qualifier )?
             {
                 adaptor.addChild(root_0, stream_folderId.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:393:15: ( qualifier )?
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:15: ( qualifier )?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_0, stream_qualifier.nextTree());
 
@@ -5062,10 +4991,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5078,75 +5007,75 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "orderByClause"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:396:1: orderByClause : ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:550:1: orderByClause : ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) ;
     public final CMISParser.orderByClause_return orderByClause() throws RecognitionException {
         CMISParser.orderByClause_return retval = new CMISParser.orderByClause_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ORDER137=null;
-        Token BY138=null;
-        Token COMMA140=null;
-        CMISParser.sortSpecification_return sortSpecification139 = null;
+        Token ORDER140=null;
+        Token BY141=null;
+        Token COMMA143=null;
+        CMISParser.sortSpecification_return sortSpecification142 = null;
 
-        CMISParser.sortSpecification_return sortSpecification141 = null;
+        CMISParser.sortSpecification_return sortSpecification144 = null;
 
 
-        Object ORDER137_tree=null;
-        Object BY138_tree=null;
-        Object COMMA140_tree=null;
+        Object ORDER140_tree=null;
+        Object BY141_tree=null;
+        Object COMMA143_tree=null;
         RewriteRuleTokenStream stream_BY=new RewriteRuleTokenStream(adaptor,"token BY");
         RewriteRuleTokenStream stream_ORDER=new RewriteRuleTokenStream(adaptor,"token ORDER");
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleSubtreeStream stream_sortSpecification=new RewriteRuleSubtreeStream(adaptor,"rule sortSpecification");
             paraphrases.push("in order by"); 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:399:2: ( ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:399:4: ORDER BY sortSpecification ( COMMA sortSpecification )*
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:553:2: ( ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:553:4: ORDER BY sortSpecification ( COMMA sortSpecification )*
             {
-            ORDER137=(Token)match(input,ORDER,FOLLOW_ORDER_in_orderByClause1633); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_ORDER.add(ORDER137);
+            ORDER140=(Token)match(input,ORDER,FOLLOW_ORDER_in_orderByClause1887); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_ORDER.add(ORDER140);
 
-            BY138=(Token)match(input,BY,FOLLOW_BY_in_orderByClause1635); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_BY.add(BY138);
+            BY141=(Token)match(input,BY,FOLLOW_BY_in_orderByClause1889); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_BY.add(BY141);
 
-            pushFollow(FOLLOW_sortSpecification_in_orderByClause1637);
-            sortSpecification139=sortSpecification();
+            pushFollow(FOLLOW_sortSpecification_in_orderByClause1891);
+            sortSpecification142=sortSpecification();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_sortSpecification.add(sortSpecification139.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:399:31: ( COMMA sortSpecification )*
-            loop39:
+            if ( state.backtracking==0 ) stream_sortSpecification.add(sortSpecification142.getTree());
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:553:31: ( COMMA sortSpecification )*
+            loop41:
             do {
-                int alt39=2;
-                int LA39_0 = input.LA(1);
+                int alt41=2;
+                int LA41_0 = input.LA(1);
 
-                if ( (LA39_0==COMMA) ) {
-                    alt39=1;
+                if ( (LA41_0==COMMA) ) {
+                    alt41=1;
                 }
 
 
-                switch (alt39) {
+                switch (alt41) {
             	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:399:33: COMMA sortSpecification
+            	    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:553:33: COMMA sortSpecification
             	    {
-            	    COMMA140=(Token)match(input,COMMA,FOLLOW_COMMA_in_orderByClause1641); if (state.failed) return retval; 
-            	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA140);
+            	    COMMA143=(Token)match(input,COMMA,FOLLOW_COMMA_in_orderByClause1895); if (state.failed) return retval; 
+            	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA143);
 
-            	    pushFollow(FOLLOW_sortSpecification_in_orderByClause1643);
-            	    sortSpecification141=sortSpecification();
+            	    pushFollow(FOLLOW_sortSpecification_in_orderByClause1897);
+            	    sortSpecification144=sortSpecification();
 
             	    state._fsp--;
             	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_sortSpecification.add(sortSpecification141.getTree());
+            	    if ( state.backtracking==0 ) stream_sortSpecification.add(sortSpecification144.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop39;
+            	    break loop41;
                 }
             } while (true);
 
@@ -5164,9 +5093,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 400:3: -> ^( ORDER ( sortSpecification )+ )
+            // 554:3: -> ^( ORDER ( sortSpecification )+ )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:400:6: ^( ORDER ( sortSpecification )+ )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:554:6: ^( ORDER ( sortSpecification )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_ORDER.nextNode(), root_1);
@@ -5200,10 +5129,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5216,7 +5145,7 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "sortSpecification"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:403:1: sortSpecification : ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:557:1: sortSpecification : ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) );
     public final CMISParser.sortSpecification_return sortSpecification() throws RecognitionException {
         CMISParser.sortSpecification_return retval = new CMISParser.sortSpecification_return();
         retval.start = input.LT(1);
@@ -5224,9 +5153,9 @@ public class CMISParser extends Parser {
         Object root_0 = null;
 
         Token by=null;
-        CMISParser.columnReference_return columnReference142 = null;
+        CMISParser.columnReference_return columnReference145 = null;
 
-        CMISParser.columnReference_return columnReference143 = null;
+        CMISParser.columnReference_return columnReference146 = null;
 
 
         Object by_tree=null;
@@ -5234,19 +5163,19 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_DESC=new RewriteRuleTokenStream(adaptor,"token DESC");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:404:2: ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) )
-            int alt41=2;
-            alt41 = dfa41.predict(input);
-            switch (alt41) {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:558:2: ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) )
+            int alt43=2;
+            alt43 = dfa43.predict(input);
+            switch (alt43) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:404:4: columnReference
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:558:4: columnReference
                     {
-                    pushFollow(FOLLOW_columnReference_in_sortSpecification1669);
-                    columnReference142=columnReference();
+                    pushFollow(FOLLOW_columnReference_in_sortSpecification1923);
+                    columnReference145=columnReference();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference142.getTree());
+                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference145.getTree());
 
 
                     // AST REWRITE
@@ -5261,9 +5190,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 405:3: -> ^( SORT_SPECIFICATION columnReference ASC )
+                    // 559:3: -> ^( SORT_SPECIFICATION columnReference ASC )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:405:6: ^( SORT_SPECIFICATION columnReference ASC )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:559:6: ^( SORT_SPECIFICATION columnReference ASC )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SORT_SPECIFICATION, "SORT_SPECIFICATION"), root_1);
@@ -5280,45 +5209,45 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:406:4: columnReference (by= ASC | by= DESC )
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:560:4: columnReference (by= ASC | by= DESC )
                     {
-                    pushFollow(FOLLOW_columnReference_in_sortSpecification1687);
-                    columnReference143=columnReference();
+                    pushFollow(FOLLOW_columnReference_in_sortSpecification1941);
+                    columnReference146=columnReference();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference143.getTree());
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:406:20: (by= ASC | by= DESC )
-                    int alt40=2;
-                    int LA40_0 = input.LA(1);
+                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference146.getTree());
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:560:20: (by= ASC | by= DESC )
+                    int alt42=2;
+                    int LA42_0 = input.LA(1);
 
-                    if ( (LA40_0==ASC) ) {
-                        alt40=1;
+                    if ( (LA42_0==ASC) ) {
+                        alt42=1;
                     }
-                    else if ( (LA40_0==DESC) ) {
-                        alt40=2;
+                    else if ( (LA42_0==DESC) ) {
+                        alt42=2;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 40, 0, input);
+                            new NoViableAltException("", 42, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt40) {
+                    switch (alt42) {
                         case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:406:22: by= ASC
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:560:22: by= ASC
                             {
-                            by=(Token)match(input,ASC,FOLLOW_ASC_in_sortSpecification1693); if (state.failed) return retval; 
+                            by=(Token)match(input,ASC,FOLLOW_ASC_in_sortSpecification1947); if (state.failed) return retval; 
                             if ( state.backtracking==0 ) stream_ASC.add(by);
 
 
                             }
                             break;
                         case 2 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:406:31: by= DESC
+                            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:560:31: by= DESC
                             {
-                            by=(Token)match(input,DESC,FOLLOW_DESC_in_sortSpecification1699); if (state.failed) return retval; 
+                            by=(Token)match(input,DESC,FOLLOW_DESC_in_sortSpecification1953); if (state.failed) return retval; 
                             if ( state.backtracking==0 ) stream_DESC.add(by);
 
 
@@ -5330,7 +5259,7 @@ public class CMISParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: by, columnReference
+                    // elements: columnReference, by
                     // token labels: by
                     // rule labels: retval
                     // token list labels: 
@@ -5342,9 +5271,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 407:3: -> ^( SORT_SPECIFICATION columnReference $by)
+                    // 561:3: -> ^( SORT_SPECIFICATION columnReference $by)
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:407:6: ^( SORT_SPECIFICATION columnReference $by)
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:561:6: ^( SORT_SPECIFICATION columnReference $by)
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SORT_SPECIFICATION, "SORT_SPECIFICATION"), root_1);
@@ -5371,10 +5300,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5387,29 +5316,29 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "correlationName"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:410:1: correlationName : identifier ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:564:1: correlationName : identifier ;
     public final CMISParser.correlationName_return correlationName() throws RecognitionException {
         CMISParser.correlationName_return retval = new CMISParser.correlationName_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.identifier_return identifier144 = null;
+        CMISParser.identifier_return identifier147 = null;
 
 
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:411:2: ( identifier )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:411:4: identifier
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:565:2: ( identifier )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:565:4: identifier
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_identifier_in_correlationName1726);
-            identifier144=identifier();
+            pushFollow(FOLLOW_identifier_in_correlationName1980);
+            identifier147=identifier();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) adaptor.addChild(root_0, identifier144.getTree());
+            if ( state.backtracking==0 ) adaptor.addChild(root_0, identifier147.getTree());
 
             }
 
@@ -5422,10 +5351,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5438,27 +5367,27 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "tableName"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:1: tableName : identifier -> identifier ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:572:1: tableName : identifier -> identifier ;
     public final CMISParser.tableName_return tableName() throws RecognitionException {
         CMISParser.tableName_return retval = new CMISParser.tableName_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.identifier_return identifier145 = null;
+        CMISParser.identifier_return identifier148 = null;
 
 
         RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:419:2: ( identifier -> identifier )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:419:4: identifier
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:573:2: ( identifier -> identifier )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:573:4: identifier
             {
-            pushFollow(FOLLOW_identifier_in_tableName1740);
-            identifier145=identifier();
+            pushFollow(FOLLOW_identifier_in_tableName1994);
+            identifier148=identifier();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_identifier.add(identifier145.getTree());
+            if ( state.backtracking==0 ) stream_identifier.add(identifier148.getTree());
 
 
             // AST REWRITE
@@ -5473,7 +5402,7 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 420:3: -> identifier
+            // 574:3: -> identifier
             {
                 adaptor.addChild(root_0, stream_identifier.nextTree());
 
@@ -5491,10 +5420,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5507,166 +5436,22 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "columnName"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:423:1: columnName : identifier -> identifier ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:577:1: columnName : identifier -> identifier ;
     public final CMISParser.columnName_return columnName() throws RecognitionException {
         CMISParser.columnName_return retval = new CMISParser.columnName_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.identifier_return identifier146 = null;
-
-
-        RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:424:2: ( identifier -> identifier )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:424:4: identifier
-            {
-            pushFollow(FOLLOW_identifier_in_columnName1758);
-            identifier146=identifier();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_identifier.add(identifier146.getTree());
-
-
-            // AST REWRITE
-            // elements: identifier
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 425:3: -> identifier
-            {
-                adaptor.addChild(root_0, stream_identifier.nextTree());
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "columnName"
-
-    public static class multiValuedColumnName_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "multiValuedColumnName"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:428:1: multiValuedColumnName : identifier -> identifier ;
-    public final CMISParser.multiValuedColumnName_return multiValuedColumnName() throws RecognitionException {
-        CMISParser.multiValuedColumnName_return retval = new CMISParser.multiValuedColumnName_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.identifier_return identifier147 = null;
-
-
-        RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:429:2: ( identifier -> identifier )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:429:4: identifier
-            {
-            pushFollow(FOLLOW_identifier_in_multiValuedColumnName1777);
-            identifier147=identifier();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_identifier.add(identifier147.getTree());
-
-
-            // AST REWRITE
-            // elements: identifier
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 430:3: -> identifier
-            {
-                adaptor.addChild(root_0, stream_identifier.nextTree());
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "multiValuedColumnName"
-
-    public static class parameterName_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "parameterName"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:433:1: parameterName : COLON identifier -> ^( PARAMETER identifier ) ;
-    public final CMISParser.parameterName_return parameterName() throws RecognitionException {
-        CMISParser.parameterName_return retval = new CMISParser.parameterName_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token COLON148=null;
         CMISParser.identifier_return identifier149 = null;
 
 
-        Object COLON148_tree=null;
-        RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:434:2: ( COLON identifier -> ^( PARAMETER identifier ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:434:4: COLON identifier
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:578:2: ( identifier -> identifier )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:578:4: identifier
             {
-            COLON148=(Token)match(input,COLON,FOLLOW_COLON_in_parameterName1795); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_COLON.add(COLON148);
-
-            pushFollow(FOLLOW_identifier_in_parameterName1797);
+            pushFollow(FOLLOW_identifier_in_columnName2012);
             identifier149=identifier();
 
             state._fsp--;
@@ -5686,9 +5471,153 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 435:3: -> ^( PARAMETER identifier )
+            // 579:3: -> identifier
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:435:6: ^( PARAMETER identifier )
+                adaptor.addChild(root_0, stream_identifier.nextTree());
+
+            }
+
+            retval.tree = root_0;}
+            }
+
+            retval.stop = input.LT(-1);
+
+            if ( state.backtracking==0 ) {
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+            }
+        }
+
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
+        finally {
+        }
+        return retval;
+    }
+    // $ANTLR end "columnName"
+
+    public static class multiValuedColumnName_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+    // $ANTLR start "multiValuedColumnName"
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:582:1: multiValuedColumnName : identifier -> identifier ;
+    public final CMISParser.multiValuedColumnName_return multiValuedColumnName() throws RecognitionException {
+        CMISParser.multiValuedColumnName_return retval = new CMISParser.multiValuedColumnName_return();
+        retval.start = input.LT(1);
+
+        Object root_0 = null;
+
+        CMISParser.identifier_return identifier150 = null;
+
+
+        RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
+        try {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:583:2: ( identifier -> identifier )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:583:4: identifier
+            {
+            pushFollow(FOLLOW_identifier_in_multiValuedColumnName2031);
+            identifier150=identifier();
+
+            state._fsp--;
+            if (state.failed) return retval;
+            if ( state.backtracking==0 ) stream_identifier.add(identifier150.getTree());
+
+
+            // AST REWRITE
+            // elements: identifier
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            if ( state.backtracking==0 ) {
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 584:3: -> identifier
+            {
+                adaptor.addChild(root_0, stream_identifier.nextTree());
+
+            }
+
+            retval.tree = root_0;}
+            }
+
+            retval.stop = input.LT(-1);
+
+            if ( state.backtracking==0 ) {
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+            }
+        }
+
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
+        finally {
+        }
+        return retval;
+    }
+    // $ANTLR end "multiValuedColumnName"
+
+    public static class parameterName_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+    // $ANTLR start "parameterName"
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:587:1: parameterName : COLON identifier -> ^( PARAMETER identifier ) ;
+    public final CMISParser.parameterName_return parameterName() throws RecognitionException {
+        CMISParser.parameterName_return retval = new CMISParser.parameterName_return();
+        retval.start = input.LT(1);
+
+        Object root_0 = null;
+
+        Token COLON151=null;
+        CMISParser.identifier_return identifier152 = null;
+
+
+        Object COLON151_tree=null;
+        RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
+        RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
+        try {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:588:2: ( COLON identifier -> ^( PARAMETER identifier ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:588:4: COLON identifier
+            {
+            COLON151=(Token)match(input,COLON,FOLLOW_COLON_in_parameterName2049); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_COLON.add(COLON151);
+
+            pushFollow(FOLLOW_identifier_in_parameterName2051);
+            identifier152=identifier();
+
+            state._fsp--;
+            if (state.failed) return retval;
+            if ( state.backtracking==0 ) stream_identifier.add(identifier152.getTree());
+
+
+            // AST REWRITE
+            // elements: identifier
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            if ( state.backtracking==0 ) {
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 589:3: -> ^( PARAMETER identifier )
+            {
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:589:6: ^( PARAMETER identifier )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PARAMETER, "PARAMETER"), root_1);
@@ -5712,10 +5641,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5728,27 +5657,27 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "folderId"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:438:1: folderId : characterStringLiteral -> characterStringLiteral ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:592:1: folderId : characterStringLiteral -> characterStringLiteral ;
     public final CMISParser.folderId_return folderId() throws RecognitionException {
         CMISParser.folderId_return retval = new CMISParser.folderId_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        CMISParser.characterStringLiteral_return characterStringLiteral150 = null;
+        CMISParser.characterStringLiteral_return characterStringLiteral153 = null;
 
 
         RewriteRuleSubtreeStream stream_characterStringLiteral=new RewriteRuleSubtreeStream(adaptor,"rule characterStringLiteral");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:439:3: ( characterStringLiteral -> characterStringLiteral )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:439:5: characterStringLiteral
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:593:3: ( characterStringLiteral -> characterStringLiteral )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:593:5: characterStringLiteral
             {
-            pushFollow(FOLLOW_characterStringLiteral_in_folderId1820);
-            characterStringLiteral150=characterStringLiteral();
+            pushFollow(FOLLOW_characterStringLiteral_in_folderId2074);
+            characterStringLiteral153=characterStringLiteral();
 
             state._fsp--;
             if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_characterStringLiteral.add(characterStringLiteral150.getTree());
+            if ( state.backtracking==0 ) stream_characterStringLiteral.add(characterStringLiteral153.getTree());
 
 
             // AST REWRITE
@@ -5763,7 +5692,7 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 440:4: -> characterStringLiteral
+            // 594:4: -> characterStringLiteral
             {
                 adaptor.addChild(root_0, stream_characterStringLiteral.nextTree());
 
@@ -5781,10 +5710,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5797,27 +5726,27 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "textSearchExpression"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:443:1: textSearchExpression : QUOTED_STRING ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:597:1: textSearchExpression : QUOTED_STRING ;
     public final CMISParser.textSearchExpression_return textSearchExpression() throws RecognitionException {
         CMISParser.textSearchExpression_return retval = new CMISParser.textSearchExpression_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token QUOTED_STRING151=null;
+        Token QUOTED_STRING154=null;
 
-        Object QUOTED_STRING151_tree=null;
+        Object QUOTED_STRING154_tree=null;
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:444:2: ( QUOTED_STRING )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:444:4: QUOTED_STRING
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:598:2: ( QUOTED_STRING )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:598:4: QUOTED_STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            QUOTED_STRING151=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_textSearchExpression1841); if (state.failed) return retval;
+            QUOTED_STRING154=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_textSearchExpression2095); if (state.failed) return retval;
             if ( state.backtracking==0 ) {
-            QUOTED_STRING151_tree = (Object)adaptor.create(QUOTED_STRING151);
-            adaptor.addChild(root_0, QUOTED_STRING151_tree);
+            QUOTED_STRING154_tree = (Object)adaptor.create(QUOTED_STRING154);
+            adaptor.addChild(root_0, QUOTED_STRING154_tree);
             }
 
             }
@@ -5831,10 +5760,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5847,49 +5776,49 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "identifier"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:447:1: identifier : ( ID -> ID | {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:1: identifier : ( ID -> ID | {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) );
     public final CMISParser.identifier_return identifier() throws RecognitionException {
         CMISParser.identifier_return retval = new CMISParser.identifier_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ID152=null;
-        Token DOUBLE_QUOTE153=null;
-        Token DOUBLE_QUOTE155=null;
-        CMISParser.keyWordOrId_return keyWordOrId154 = null;
+        Token ID155=null;
+        Token DOUBLE_QUOTE156=null;
+        Token DOUBLE_QUOTE158=null;
+        CMISParser.keyWordOrId_return keyWordOrId157 = null;
 
 
-        Object ID152_tree=null;
-        Object DOUBLE_QUOTE153_tree=null;
-        Object DOUBLE_QUOTE155_tree=null;
+        Object ID155_tree=null;
+        Object DOUBLE_QUOTE156_tree=null;
+        Object DOUBLE_QUOTE158_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_DOUBLE_QUOTE=new RewriteRuleTokenStream(adaptor,"token DOUBLE_QUOTE");
         RewriteRuleSubtreeStream stream_keyWordOrId=new RewriteRuleSubtreeStream(adaptor,"rule keyWordOrId");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:448:2: ( ID -> ID | {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) )
-            int alt42=2;
-            int LA42_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:602:2: ( ID -> ID | {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) )
+            int alt44=2;
+            int LA44_0 = input.LA(1);
 
-            if ( (LA42_0==ID) ) {
-                alt42=1;
+            if ( (LA44_0==ID) ) {
+                alt44=1;
             }
-            else if ( (LA42_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt42=2;
+            else if ( (LA44_0==DOUBLE_QUOTE) && ((strict == false))) {
+                alt44=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 42, 0, input);
+                    new NoViableAltException("", 44, 0, input);
 
                 throw nvae;
             }
-            switch (alt42) {
+            switch (alt44) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:448:4: ID
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:602:4: ID
                     {
-                    ID152=(Token)match(input,ID,FOLLOW_ID_in_identifier1853); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_ID.add(ID152);
+                    ID155=(Token)match(input,ID,FOLLOW_ID_in_identifier2107); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_ID.add(ID155);
 
 
 
@@ -5905,7 +5834,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 449:3: -> ID
+                    // 603:3: -> ID
                     {
                         adaptor.addChild(root_0, stream_ID.nextNode());
 
@@ -5915,23 +5844,23 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:450:4: {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:604:4: {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE
                     {
                     if ( !((strict == false)) ) {
                         if (state.backtracking>0) {state.failed=true; return retval;}
                         throw new FailedPredicateException(input, "identifier", "strict == false");
                     }
-                    DOUBLE_QUOTE153=(Token)match(input,DOUBLE_QUOTE,FOLLOW_DOUBLE_QUOTE_in_identifier1868); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_DOUBLE_QUOTE.add(DOUBLE_QUOTE153);
+                    DOUBLE_QUOTE156=(Token)match(input,DOUBLE_QUOTE,FOLLOW_DOUBLE_QUOTE_in_identifier2122); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_DOUBLE_QUOTE.add(DOUBLE_QUOTE156);
 
-                    pushFollow(FOLLOW_keyWordOrId_in_identifier1870);
-                    keyWordOrId154=keyWordOrId();
+                    pushFollow(FOLLOW_keyWordOrId_in_identifier2124);
+                    keyWordOrId157=keyWordOrId();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_keyWordOrId.add(keyWordOrId154.getTree());
-                    DOUBLE_QUOTE155=(Token)match(input,DOUBLE_QUOTE,FOLLOW_DOUBLE_QUOTE_in_identifier1872); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_DOUBLE_QUOTE.add(DOUBLE_QUOTE155);
+                    if ( state.backtracking==0 ) stream_keyWordOrId.add(keyWordOrId157.getTree());
+                    DOUBLE_QUOTE158=(Token)match(input,DOUBLE_QUOTE,FOLLOW_DOUBLE_QUOTE_in_identifier2126); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_DOUBLE_QUOTE.add(DOUBLE_QUOTE158);
 
 
 
@@ -5947,9 +5876,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 451:3: -> ^( keyWordOrId )
+                    // 605:3: -> ^( keyWordOrId )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:451:6: ^( keyWordOrId )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:605:6: ^( keyWordOrId )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(stream_keyWordOrId.nextNode(), root_1);
@@ -5973,10 +5902,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -5989,44 +5918,44 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "signedNumericLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:1: signedNumericLiteral : ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:608:1: signedNumericLiteral : ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral );
     public final CMISParser.signedNumericLiteral_return signedNumericLiteral() throws RecognitionException {
         CMISParser.signedNumericLiteral_return retval = new CMISParser.signedNumericLiteral_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token FLOATING_POINT_LITERAL156=null;
-        CMISParser.integerLiteral_return integerLiteral157 = null;
+        Token FLOATING_POINT_LITERAL159=null;
+        CMISParser.integerLiteral_return integerLiteral160 = null;
 
 
-        Object FLOATING_POINT_LITERAL156_tree=null;
+        Object FLOATING_POINT_LITERAL159_tree=null;
         RewriteRuleTokenStream stream_FLOATING_POINT_LITERAL=new RewriteRuleTokenStream(adaptor,"token FLOATING_POINT_LITERAL");
         RewriteRuleSubtreeStream stream_integerLiteral=new RewriteRuleSubtreeStream(adaptor,"rule integerLiteral");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:455:2: ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral )
-            int alt43=2;
-            int LA43_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:609:2: ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral )
+            int alt45=2;
+            int LA45_0 = input.LA(1);
 
-            if ( (LA43_0==FLOATING_POINT_LITERAL) ) {
-                alt43=1;
+            if ( (LA45_0==FLOATING_POINT_LITERAL) ) {
+                alt45=1;
             }
-            else if ( (LA43_0==DECIMAL_INTEGER_LITERAL) ) {
-                alt43=2;
+            else if ( (LA45_0==DECIMAL_INTEGER_LITERAL) ) {
+                alt45=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 43, 0, input);
+                    new NoViableAltException("", 45, 0, input);
 
                 throw nvae;
             }
-            switch (alt43) {
+            switch (alt45) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:455:4: FLOATING_POINT_LITERAL
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:609:4: FLOATING_POINT_LITERAL
                     {
-                    FLOATING_POINT_LITERAL156=(Token)match(input,FLOATING_POINT_LITERAL,FOLLOW_FLOATING_POINT_LITERAL_in_signedNumericLiteral1892); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_FLOATING_POINT_LITERAL.add(FLOATING_POINT_LITERAL156);
+                    FLOATING_POINT_LITERAL159=(Token)match(input,FLOATING_POINT_LITERAL,FOLLOW_FLOATING_POINT_LITERAL_in_signedNumericLiteral2146); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_FLOATING_POINT_LITERAL.add(FLOATING_POINT_LITERAL159);
 
 
 
@@ -6042,9 +5971,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 456:3: -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL )
+                    // 610:3: -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:456:6: ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:610:6: ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(NUMERIC_LITERAL, "NUMERIC_LITERAL"), root_1);
@@ -6060,14 +5989,14 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:457:4: integerLiteral
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:611:4: integerLiteral
                     {
-                    pushFollow(FOLLOW_integerLiteral_in_signedNumericLiteral1907);
-                    integerLiteral157=integerLiteral();
+                    pushFollow(FOLLOW_integerLiteral_in_signedNumericLiteral2161);
+                    integerLiteral160=integerLiteral();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_integerLiteral.add(integerLiteral157.getTree());
+                    if ( state.backtracking==0 ) stream_integerLiteral.add(integerLiteral160.getTree());
 
 
                     // AST REWRITE
@@ -6082,7 +6011,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 458:3: -> integerLiteral
+                    // 612:3: -> integerLiteral
                     {
                         adaptor.addChild(root_0, stream_integerLiteral.nextTree());
 
@@ -6102,10 +6031,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -6118,24 +6047,24 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "integerLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:461:1: integerLiteral : DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:615:1: integerLiteral : DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) ;
     public final CMISParser.integerLiteral_return integerLiteral() throws RecognitionException {
         CMISParser.integerLiteral_return retval = new CMISParser.integerLiteral_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token DECIMAL_INTEGER_LITERAL158=null;
+        Token DECIMAL_INTEGER_LITERAL161=null;
 
-        Object DECIMAL_INTEGER_LITERAL158_tree=null;
+        Object DECIMAL_INTEGER_LITERAL161_tree=null;
         RewriteRuleTokenStream stream_DECIMAL_INTEGER_LITERAL=new RewriteRuleTokenStream(adaptor,"token DECIMAL_INTEGER_LITERAL");
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:462:2: ( DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:462:4: DECIMAL_INTEGER_LITERAL
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:616:2: ( DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:616:4: DECIMAL_INTEGER_LITERAL
             {
-            DECIMAL_INTEGER_LITERAL158=(Token)match(input,DECIMAL_INTEGER_LITERAL,FOLLOW_DECIMAL_INTEGER_LITERAL_in_integerLiteral1926); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_DECIMAL_INTEGER_LITERAL.add(DECIMAL_INTEGER_LITERAL158);
+            DECIMAL_INTEGER_LITERAL161=(Token)match(input,DECIMAL_INTEGER_LITERAL,FOLLOW_DECIMAL_INTEGER_LITERAL_in_integerLiteral2180); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_DECIMAL_INTEGER_LITERAL.add(DECIMAL_INTEGER_LITERAL161);
 
 
 
@@ -6151,9 +6080,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 463:3: -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL )
+            // 617:3: -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:463:6: ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:617:6: ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(NUMERIC_LITERAL, "NUMERIC_LITERAL"), root_1);
@@ -6177,10 +6106,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -6193,45 +6122,45 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "booleanLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:466:1: booleanLiteral : ( TRUE -> ^( BOOLEAN_LITERAL TRUE ) | FALSE -> ^( BOOLEAN_LITERAL FALSE ) );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:620:1: booleanLiteral : ( TRUE -> ^( BOOLEAN_LITERAL TRUE ) | FALSE -> ^( BOOLEAN_LITERAL FALSE ) );
     public final CMISParser.booleanLiteral_return booleanLiteral() throws RecognitionException {
         CMISParser.booleanLiteral_return retval = new CMISParser.booleanLiteral_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token TRUE159=null;
-        Token FALSE160=null;
+        Token TRUE162=null;
+        Token FALSE163=null;
 
-        Object TRUE159_tree=null;
-        Object FALSE160_tree=null;
+        Object TRUE162_tree=null;
+        Object FALSE163_tree=null;
         RewriteRuleTokenStream stream_FALSE=new RewriteRuleTokenStream(adaptor,"token FALSE");
         RewriteRuleTokenStream stream_TRUE=new RewriteRuleTokenStream(adaptor,"token TRUE");
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:467:3: ( TRUE -> ^( BOOLEAN_LITERAL TRUE ) | FALSE -> ^( BOOLEAN_LITERAL FALSE ) )
-            int alt44=2;
-            int LA44_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:621:3: ( TRUE -> ^( BOOLEAN_LITERAL TRUE ) | FALSE -> ^( BOOLEAN_LITERAL FALSE ) )
+            int alt46=2;
+            int LA46_0 = input.LA(1);
 
-            if ( (LA44_0==TRUE) ) {
-                alt44=1;
+            if ( (LA46_0==TRUE) ) {
+                alt46=1;
             }
-            else if ( (LA44_0==FALSE) ) {
-                alt44=2;
+            else if ( (LA46_0==FALSE) ) {
+                alt46=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 44, 0, input);
+                    new NoViableAltException("", 46, 0, input);
 
                 throw nvae;
             }
-            switch (alt44) {
+            switch (alt46) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:467:5: TRUE
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:621:5: TRUE
                     {
-                    TRUE159=(Token)match(input,TRUE,FOLLOW_TRUE_in_booleanLiteral1950); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_TRUE.add(TRUE159);
+                    TRUE162=(Token)match(input,TRUE,FOLLOW_TRUE_in_booleanLiteral2204); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_TRUE.add(TRUE162);
 
 
 
@@ -6247,9 +6176,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 468:3: -> ^( BOOLEAN_LITERAL TRUE )
+                    // 622:3: -> ^( BOOLEAN_LITERAL TRUE )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:468:7: ^( BOOLEAN_LITERAL TRUE )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:622:7: ^( BOOLEAN_LITERAL TRUE )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(BOOLEAN_LITERAL, "BOOLEAN_LITERAL"), root_1);
@@ -6265,10 +6194,10 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:469:5: FALSE
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:5: FALSE
                     {
-                    FALSE160=(Token)match(input,FALSE,FOLLOW_FALSE_in_booleanLiteral1968); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_FALSE.add(FALSE160);
+                    FALSE163=(Token)match(input,FALSE,FOLLOW_FALSE_in_booleanLiteral2222); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_FALSE.add(FALSE163);
 
 
 
@@ -6284,9 +6213,9 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 470:3: -> ^( BOOLEAN_LITERAL FALSE )
+                    // 624:3: -> ^( BOOLEAN_LITERAL FALSE )
                     {
-                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:470:7: ^( BOOLEAN_LITERAL FALSE )
+                        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:624:7: ^( BOOLEAN_LITERAL FALSE )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(BOOLEAN_LITERAL, "BOOLEAN_LITERAL"), root_1);
@@ -6312,10 +6241,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -6328,30 +6257,30 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "datetimeLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:473:1: datetimeLiteral : TIMESTAMP QUOTED_STRING -> ^( DATETIME_LITERAL QUOTED_STRING ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:627:1: datetimeLiteral : TIMESTAMP QUOTED_STRING -> ^( DATETIME_LITERAL QUOTED_STRING ) ;
     public final CMISParser.datetimeLiteral_return datetimeLiteral() throws RecognitionException {
         CMISParser.datetimeLiteral_return retval = new CMISParser.datetimeLiteral_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token TIMESTAMP161=null;
-        Token QUOTED_STRING162=null;
+        Token TIMESTAMP164=null;
+        Token QUOTED_STRING165=null;
 
-        Object TIMESTAMP161_tree=null;
-        Object QUOTED_STRING162_tree=null;
+        Object TIMESTAMP164_tree=null;
+        Object QUOTED_STRING165_tree=null;
         RewriteRuleTokenStream stream_QUOTED_STRING=new RewriteRuleTokenStream(adaptor,"token QUOTED_STRING");
         RewriteRuleTokenStream stream_TIMESTAMP=new RewriteRuleTokenStream(adaptor,"token TIMESTAMP");
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:474:3: ( TIMESTAMP QUOTED_STRING -> ^( DATETIME_LITERAL QUOTED_STRING ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:474:5: TIMESTAMP QUOTED_STRING
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:628:3: ( TIMESTAMP QUOTED_STRING -> ^( DATETIME_LITERAL QUOTED_STRING ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:628:5: TIMESTAMP QUOTED_STRING
             {
-            TIMESTAMP161=(Token)match(input,TIMESTAMP,FOLLOW_TIMESTAMP_in_datetimeLiteral1993); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_TIMESTAMP.add(TIMESTAMP161);
+            TIMESTAMP164=(Token)match(input,TIMESTAMP,FOLLOW_TIMESTAMP_in_datetimeLiteral2247); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_TIMESTAMP.add(TIMESTAMP164);
 
-            QUOTED_STRING162=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_datetimeLiteral1995); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_QUOTED_STRING.add(QUOTED_STRING162);
+            QUOTED_STRING165=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_datetimeLiteral2249); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_QUOTED_STRING.add(QUOTED_STRING165);
 
 
 
@@ -6367,9 +6296,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 475:3: -> ^( DATETIME_LITERAL QUOTED_STRING )
+            // 629:3: -> ^( DATETIME_LITERAL QUOTED_STRING )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:475:6: ^( DATETIME_LITERAL QUOTED_STRING )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:629:6: ^( DATETIME_LITERAL QUOTED_STRING )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DATETIME_LITERAL, "DATETIME_LITERAL"), root_1);
@@ -6393,10 +6322,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -6409,24 +6338,24 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "characterStringLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:478:1: characterStringLiteral : QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:632:1: characterStringLiteral : QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) ;
     public final CMISParser.characterStringLiteral_return characterStringLiteral() throws RecognitionException {
         CMISParser.characterStringLiteral_return retval = new CMISParser.characterStringLiteral_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token QUOTED_STRING163=null;
+        Token QUOTED_STRING166=null;
 
-        Object QUOTED_STRING163_tree=null;
+        Object QUOTED_STRING166_tree=null;
         RewriteRuleTokenStream stream_QUOTED_STRING=new RewriteRuleTokenStream(adaptor,"token QUOTED_STRING");
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:479:2: ( QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:479:4: QUOTED_STRING
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:633:2: ( QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:633:4: QUOTED_STRING
             {
-            QUOTED_STRING163=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_characterStringLiteral2018); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_QUOTED_STRING.add(QUOTED_STRING163);
+            QUOTED_STRING166=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_characterStringLiteral2272); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_QUOTED_STRING.add(QUOTED_STRING166);
 
 
 
@@ -6442,9 +6371,9 @@ public class CMISParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 480:3: -> ^( STRING_LITERAL QUOTED_STRING )
+            // 634:3: -> ^( STRING_LITERAL QUOTED_STRING )
             {
-                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:480:6: ^( STRING_LITERAL QUOTED_STRING )
+                // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:634:6: ^( STRING_LITERAL QUOTED_STRING )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(STRING_LITERAL, "STRING_LITERAL"), root_1);
@@ -6468,10 +6397,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -6484,36 +6413,656 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "keyWord"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:1: keyWord : ( SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:638:1: keyWord : ( SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | cmisFunction );
     public final CMISParser.keyWord_return keyWord() throws RecognitionException {
         CMISParser.keyWord_return retval = new CMISParser.keyWord_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token set164=null;
+        Token SELECT167=null;
+        Token AS168=null;
+        Token FROM169=null;
+        Token JOIN170=null;
+        Token INNER171=null;
+        Token LEFT172=null;
+        Token OUTER173=null;
+        Token ON174=null;
+        Token WHERE175=null;
+        Token OR176=null;
+        Token AND177=null;
+        Token NOT178=null;
+        Token IN179=null;
+        Token LIKE180=null;
+        Token IS181=null;
+        Token NULL182=null;
+        Token ANY183=null;
+        Token CONTAINS184=null;
+        Token IN_FOLDER185=null;
+        Token IN_TREE186=null;
+        Token ORDER187=null;
+        Token BY188=null;
+        Token ASC189=null;
+        Token DESC190=null;
+        Token TIMESTAMP191=null;
+        Token TRUE192=null;
+        Token FALSE193=null;
+        CMISParser.cmisFunction_return cmisFunction194 = null;
 
-        Object set164_tree=null;
+
+        Object SELECT167_tree=null;
+        Object AS168_tree=null;
+        Object FROM169_tree=null;
+        Object JOIN170_tree=null;
+        Object INNER171_tree=null;
+        Object LEFT172_tree=null;
+        Object OUTER173_tree=null;
+        Object ON174_tree=null;
+        Object WHERE175_tree=null;
+        Object OR176_tree=null;
+        Object AND177_tree=null;
+        Object NOT178_tree=null;
+        Object IN179_tree=null;
+        Object LIKE180_tree=null;
+        Object IS181_tree=null;
+        Object NULL182_tree=null;
+        Object ANY183_tree=null;
+        Object CONTAINS184_tree=null;
+        Object IN_FOLDER185_tree=null;
+        Object IN_TREE186_tree=null;
+        Object ORDER187_tree=null;
+        Object BY188_tree=null;
+        Object ASC189_tree=null;
+        Object DESC190_tree=null;
+        Object TIMESTAMP191_tree=null;
+        Object TRUE192_tree=null;
+        Object FALSE193_tree=null;
 
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:485:3: ( SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE )
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-            {
-            root_0 = (Object)adaptor.nil();
-
-            set164=(Token)input.LT(1);
-            if ( input.LA(1)==SELECT||input.LA(1)==AS||(input.LA(1)>=FROM && input.LA(1)<=ON)||(input.LA(1)>=WHERE && input.LA(1)<=NOT)||(input.LA(1)>=IN && input.LA(1)<=DESC)||(input.LA(1)>=TRUE && input.LA(1)<=TIMESTAMP) ) {
-                input.consume();
-                if ( state.backtracking==0 ) adaptor.addChild(root_0, (Object)adaptor.create(set164));
-                state.errorRecovery=false;state.failed=false;
-            }
-            else {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:639:3: ( SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | cmisFunction )
+            int alt47=28;
+            switch ( input.LA(1) ) {
+            case SELECT:
+                {
+                alt47=1;
+                }
+                break;
+            case AS:
+                {
+                alt47=2;
+                }
+                break;
+            case FROM:
+                {
+                alt47=3;
+                }
+                break;
+            case JOIN:
+                {
+                alt47=4;
+                }
+                break;
+            case INNER:
+                {
+                alt47=5;
+                }
+                break;
+            case LEFT:
+                {
+                alt47=6;
+                }
+                break;
+            case OUTER:
+                {
+                alt47=7;
+                }
+                break;
+            case ON:
+                {
+                alt47=8;
+                }
+                break;
+            case WHERE:
+                {
+                alt47=9;
+                }
+                break;
+            case OR:
+                {
+                alt47=10;
+                }
+                break;
+            case AND:
+                {
+                alt47=11;
+                }
+                break;
+            case NOT:
+                {
+                alt47=12;
+                }
+                break;
+            case IN:
+                {
+                alt47=13;
+                }
+                break;
+            case LIKE:
+                {
+                alt47=14;
+                }
+                break;
+            case IS:
+                {
+                alt47=15;
+                }
+                break;
+            case NULL:
+                {
+                alt47=16;
+                }
+                break;
+            case ANY:
+                {
+                alt47=17;
+                }
+                break;
+            case CONTAINS:
+                {
+                alt47=18;
+                }
+                break;
+            case IN_FOLDER:
+                {
+                alt47=19;
+                }
+                break;
+            case IN_TREE:
+                {
+                alt47=20;
+                }
+                break;
+            case ORDER:
+                {
+                alt47=21;
+                }
+                break;
+            case BY:
+                {
+                alt47=22;
+                }
+                break;
+            case ASC:
+                {
+                alt47=23;
+                }
+                break;
+            case DESC:
+                {
+                alt47=24;
+                }
+                break;
+            case TIMESTAMP:
+                {
+                alt47=25;
+                }
+                break;
+            case TRUE:
+                {
+                alt47=26;
+                }
+                break;
+            case FALSE:
+                {
+                alt47=27;
+                }
+                break;
+            case SCORE:
+                {
+                alt47=28;
+                }
+                break;
+            default:
                 if (state.backtracking>0) {state.failed=true; return retval;}
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                throw mse;
+                NoViableAltException nvae =
+                    new NoViableAltException("", 47, 0, input);
+
+                throw nvae;
             }
 
+            switch (alt47) {
+                case 1 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:639:5: SELECT
+                    {
+                    root_0 = (Object)adaptor.nil();
 
+                    SELECT167=(Token)match(input,SELECT,FOLLOW_SELECT_in_keyWord2298); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    SELECT167_tree = (Object)adaptor.create(SELECT167);
+                    adaptor.addChild(root_0, SELECT167_tree);
+                    }
+
+                    }
+                    break;
+                case 2 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:640:4: AS
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    AS168=(Token)match(input,AS,FOLLOW_AS_in_keyWord2303); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    AS168_tree = (Object)adaptor.create(AS168);
+                    adaptor.addChild(root_0, AS168_tree);
+                    }
+
+                    }
+                    break;
+                case 3 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:641:4: FROM
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    FROM169=(Token)match(input,FROM,FOLLOW_FROM_in_keyWord2308); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    FROM169_tree = (Object)adaptor.create(FROM169);
+                    adaptor.addChild(root_0, FROM169_tree);
+                    }
+
+                    }
+                    break;
+                case 4 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:642:4: JOIN
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    JOIN170=(Token)match(input,JOIN,FOLLOW_JOIN_in_keyWord2314); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    JOIN170_tree = (Object)adaptor.create(JOIN170);
+                    adaptor.addChild(root_0, JOIN170_tree);
+                    }
+
+                    }
+                    break;
+                case 5 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:643:4: INNER
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    INNER171=(Token)match(input,INNER,FOLLOW_INNER_in_keyWord2320); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    INNER171_tree = (Object)adaptor.create(INNER171);
+                    adaptor.addChild(root_0, INNER171_tree);
+                    }
+
+                    }
+                    break;
+                case 6 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:644:4: LEFT
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    LEFT172=(Token)match(input,LEFT,FOLLOW_LEFT_in_keyWord2326); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    LEFT172_tree = (Object)adaptor.create(LEFT172);
+                    adaptor.addChild(root_0, LEFT172_tree);
+                    }
+
+                    }
+                    break;
+                case 7 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:645:4: OUTER
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    OUTER173=(Token)match(input,OUTER,FOLLOW_OUTER_in_keyWord2332); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    OUTER173_tree = (Object)adaptor.create(OUTER173);
+                    adaptor.addChild(root_0, OUTER173_tree);
+                    }
+
+                    }
+                    break;
+                case 8 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:646:4: ON
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    ON174=(Token)match(input,ON,FOLLOW_ON_in_keyWord2338); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    ON174_tree = (Object)adaptor.create(ON174);
+                    adaptor.addChild(root_0, ON174_tree);
+                    }
+
+                    }
+                    break;
+                case 9 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:647:4: WHERE
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    WHERE175=(Token)match(input,WHERE,FOLLOW_WHERE_in_keyWord2344); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    WHERE175_tree = (Object)adaptor.create(WHERE175);
+                    adaptor.addChild(root_0, WHERE175_tree);
+                    }
+
+                    }
+                    break;
+                case 10 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:648:4: OR
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    OR176=(Token)match(input,OR,FOLLOW_OR_in_keyWord2350); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    OR176_tree = (Object)adaptor.create(OR176);
+                    adaptor.addChild(root_0, OR176_tree);
+                    }
+
+                    }
+                    break;
+                case 11 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:649:4: AND
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    AND177=(Token)match(input,AND,FOLLOW_AND_in_keyWord2356); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    AND177_tree = (Object)adaptor.create(AND177);
+                    adaptor.addChild(root_0, AND177_tree);
+                    }
+
+                    }
+                    break;
+                case 12 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:650:4: NOT
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    NOT178=(Token)match(input,NOT,FOLLOW_NOT_in_keyWord2362); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    NOT178_tree = (Object)adaptor.create(NOT178);
+                    adaptor.addChild(root_0, NOT178_tree);
+                    }
+
+                    }
+                    break;
+                case 13 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:651:4: IN
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    IN179=(Token)match(input,IN,FOLLOW_IN_in_keyWord2368); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    IN179_tree = (Object)adaptor.create(IN179);
+                    adaptor.addChild(root_0, IN179_tree);
+                    }
+
+                    }
+                    break;
+                case 14 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:652:4: LIKE
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    LIKE180=(Token)match(input,LIKE,FOLLOW_LIKE_in_keyWord2374); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    LIKE180_tree = (Object)adaptor.create(LIKE180);
+                    adaptor.addChild(root_0, LIKE180_tree);
+                    }
+
+                    }
+                    break;
+                case 15 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:653:4: IS
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    IS181=(Token)match(input,IS,FOLLOW_IS_in_keyWord2380); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    IS181_tree = (Object)adaptor.create(IS181);
+                    adaptor.addChild(root_0, IS181_tree);
+                    }
+
+                    }
+                    break;
+                case 16 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:654:4: NULL
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    NULL182=(Token)match(input,NULL,FOLLOW_NULL_in_keyWord2386); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    NULL182_tree = (Object)adaptor.create(NULL182);
+                    adaptor.addChild(root_0, NULL182_tree);
+                    }
+
+                    }
+                    break;
+                case 17 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:655:4: ANY
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    ANY183=(Token)match(input,ANY,FOLLOW_ANY_in_keyWord2392); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    ANY183_tree = (Object)adaptor.create(ANY183);
+                    adaptor.addChild(root_0, ANY183_tree);
+                    }
+
+                    }
+                    break;
+                case 18 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:656:4: CONTAINS
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    CONTAINS184=(Token)match(input,CONTAINS,FOLLOW_CONTAINS_in_keyWord2398); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    CONTAINS184_tree = (Object)adaptor.create(CONTAINS184);
+                    adaptor.addChild(root_0, CONTAINS184_tree);
+                    }
+
+                    }
+                    break;
+                case 19 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:657:4: IN_FOLDER
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    IN_FOLDER185=(Token)match(input,IN_FOLDER,FOLLOW_IN_FOLDER_in_keyWord2405); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    IN_FOLDER185_tree = (Object)adaptor.create(IN_FOLDER185);
+                    adaptor.addChild(root_0, IN_FOLDER185_tree);
+                    }
+
+                    }
+                    break;
+                case 20 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:658:4: IN_TREE
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    IN_TREE186=(Token)match(input,IN_TREE,FOLLOW_IN_TREE_in_keyWord2411); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    IN_TREE186_tree = (Object)adaptor.create(IN_TREE186);
+                    adaptor.addChild(root_0, IN_TREE186_tree);
+                    }
+
+                    }
+                    break;
+                case 21 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:659:4: ORDER
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    ORDER187=(Token)match(input,ORDER,FOLLOW_ORDER_in_keyWord2417); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    ORDER187_tree = (Object)adaptor.create(ORDER187);
+                    adaptor.addChild(root_0, ORDER187_tree);
+                    }
+
+                    }
+                    break;
+                case 22 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:660:4: BY
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    BY188=(Token)match(input,BY,FOLLOW_BY_in_keyWord2422); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    BY188_tree = (Object)adaptor.create(BY188);
+                    adaptor.addChild(root_0, BY188_tree);
+                    }
+
+                    }
+                    break;
+                case 23 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:661:4: ASC
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    ASC189=(Token)match(input,ASC,FOLLOW_ASC_in_keyWord2428); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    ASC189_tree = (Object)adaptor.create(ASC189);
+                    adaptor.addChild(root_0, ASC189_tree);
+                    }
+
+                    }
+                    break;
+                case 24 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:662:4: DESC
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    DESC190=(Token)match(input,DESC,FOLLOW_DESC_in_keyWord2434); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    DESC190_tree = (Object)adaptor.create(DESC190);
+                    adaptor.addChild(root_0, DESC190_tree);
+                    }
+
+                    }
+                    break;
+                case 25 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:663:4: TIMESTAMP
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    TIMESTAMP191=(Token)match(input,TIMESTAMP,FOLLOW_TIMESTAMP_in_keyWord2439); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    TIMESTAMP191_tree = (Object)adaptor.create(TIMESTAMP191);
+                    adaptor.addChild(root_0, TIMESTAMP191_tree);
+                    }
+
+                    }
+                    break;
+                case 26 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:664:4: TRUE
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    TRUE192=(Token)match(input,TRUE,FOLLOW_TRUE_in_keyWord2444); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    TRUE192_tree = (Object)adaptor.create(TRUE192);
+                    adaptor.addChild(root_0, TRUE192_tree);
+                    }
+
+                    }
+                    break;
+                case 27 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:665:4: FALSE
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    FALSE193=(Token)match(input,FALSE,FOLLOW_FALSE_in_keyWord2449); if (state.failed) return retval;
+                    if ( state.backtracking==0 ) {
+                    FALSE193_tree = (Object)adaptor.create(FALSE193);
+                    adaptor.addChild(root_0, FALSE193_tree);
+                    }
+
+                    }
+                    break;
+                case 28 :
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:666:4: cmisFunction
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    pushFollow(FOLLOW_cmisFunction_in_keyWord2454);
+                    cmisFunction194=cmisFunction();
+
+                    state._fsp--;
+                    if (state.failed) return retval;
+                    if ( state.backtracking==0 ) adaptor.addChild(root_0, cmisFunction194.getTree());
+
+                    }
+                    break;
+
+            }
+            retval.stop = input.LT(-1);
+
+            if ( state.backtracking==0 ) {
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+            }
+        }
+
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
+        finally {
+        }
+        return retval;
+    }
+    // $ANTLR end "keyWord"
+
+    public static class cmisFunction_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+    // $ANTLR start "cmisFunction"
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:669:1: cmisFunction : SCORE -> SCORE ;
+    public final CMISParser.cmisFunction_return cmisFunction() throws RecognitionException {
+        CMISParser.cmisFunction_return retval = new CMISParser.cmisFunction_return();
+        retval.start = input.LT(1);
+
+        Object root_0 = null;
+
+        Token SCORE195=null;
+
+        Object SCORE195_tree=null;
+        RewriteRuleTokenStream stream_SCORE=new RewriteRuleTokenStream(adaptor,"token SCORE");
+
+        try {
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:669:14: ( SCORE -> SCORE )
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:669:16: SCORE
+            {
+            SCORE195=(Token)match(input,SCORE,FOLLOW_SCORE_in_cmisFunction2465); if (state.failed) return retval; 
+            if ( state.backtracking==0 ) stream_SCORE.add(SCORE195);
+
+
+
+            // AST REWRITE
+            // elements: SCORE
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            if ( state.backtracking==0 ) {
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 670:2: -> SCORE
+            {
+                adaptor.addChild(root_0, stream_SCORE.nextNode());
+
+            }
+
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -6525,15 +7074,15 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
     }
-    // $ANTLR end "keyWord"
+    // $ANTLR end "cmisFunction"
 
     public static class keyWordOrId_return extends ParserRuleReturnScope {
         Object tree;
@@ -6541,48 +7090,48 @@ public class CMISParser extends Parser {
     };
 
     // $ANTLR start "keyWordOrId"
-    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:514:1: keyWordOrId : ( keyWord -> keyWord | ID -> ID );
+    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:673:1: keyWordOrId : ( keyWord -> keyWord | ID -> ID );
     public final CMISParser.keyWordOrId_return keyWordOrId() throws RecognitionException {
         CMISParser.keyWordOrId_return retval = new CMISParser.keyWordOrId_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ID166=null;
-        CMISParser.keyWord_return keyWord165 = null;
+        Token ID197=null;
+        CMISParser.keyWord_return keyWord196 = null;
 
 
-        Object ID166_tree=null;
+        Object ID197_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_keyWord=new RewriteRuleSubtreeStream(adaptor,"rule keyWord");
         try {
-            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:515:2: ( keyWord -> keyWord | ID -> ID )
-            int alt45=2;
-            int LA45_0 = input.LA(1);
+            // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:674:2: ( keyWord -> keyWord | ID -> ID )
+            int alt48=2;
+            int LA48_0 = input.LA(1);
 
-            if ( (LA45_0==SELECT||LA45_0==AS||(LA45_0>=FROM && LA45_0<=ON)||(LA45_0>=WHERE && LA45_0<=NOT)||(LA45_0>=IN && LA45_0<=DESC)||(LA45_0>=TRUE && LA45_0<=TIMESTAMP)) ) {
-                alt45=1;
+            if ( (LA48_0==SELECT||LA48_0==AS||(LA48_0>=FROM && LA48_0<=ON)||(LA48_0>=WHERE && LA48_0<=NOT)||(LA48_0>=IN && LA48_0<=DESC)||(LA48_0>=TRUE && LA48_0<=SCORE)) ) {
+                alt48=1;
             }
-            else if ( (LA45_0==ID) ) {
-                alt45=2;
+            else if ( (LA48_0==ID) ) {
+                alt48=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 45, 0, input);
+                    new NoViableAltException("", 48, 0, input);
 
                 throw nvae;
             }
-            switch (alt45) {
+            switch (alt48) {
                 case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:515:4: keyWord
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:674:4: keyWord
                     {
-                    pushFollow(FOLLOW_keyWord_in_keyWordOrId2208);
-                    keyWord165=keyWord();
+                    pushFollow(FOLLOW_keyWord_in_keyWordOrId2483);
+                    keyWord196=keyWord();
 
                     state._fsp--;
                     if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_keyWord.add(keyWord165.getTree());
+                    if ( state.backtracking==0 ) stream_keyWord.add(keyWord196.getTree());
 
 
                     // AST REWRITE
@@ -6597,7 +7146,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 516:3: -> keyWord
+                    // 675:3: -> keyWord
                     {
                         adaptor.addChild(root_0, stream_keyWord.nextTree());
 
@@ -6607,10 +7156,10 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:517:4: ID
+                    // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:676:4: ID
                     {
-                    ID166=(Token)match(input,ID,FOLLOW_ID_in_keyWordOrId2220); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_ID.add(ID166);
+                    ID197=(Token)match(input,ID,FOLLOW_ID_in_keyWordOrId2495); if (state.failed) return retval; 
+                    if ( state.backtracking==0 ) stream_ID.add(ID197);
 
 
 
@@ -6626,7 +7175,7 @@ public class CMISParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 518:3: -> ID
+                    // 677:3: -> ID
                     {
                         adaptor.addChild(root_0, stream_ID.nextNode());
 
@@ -6646,10 +7195,10 @@ public class CMISParser extends Parser {
             }
         }
 
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
+            catch(RecognitionException e)
+            {
+                throw new CMISQueryException(getErrorString(e), e);
+            }
         finally {
         }
         return retval;
@@ -6658,10 +7207,10 @@ public class CMISParser extends Parser {
 
     // $ANTLR start synpred1_CMIS
     public final void synpred1_CMIS_fragment() throws RecognitionException {   
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:4: ( valueExpression )
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:5: valueExpression
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:4: ( valueExpression )
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:314:5: valueExpression
         {
-        pushFollow(FOLLOW_valueExpression_in_synpred1_CMIS295);
+        pushFollow(FOLLOW_valueExpression_in_synpred1_CMIS340);
         valueExpression();
 
         state._fsp--;
@@ -6673,10 +7222,10 @@ public class CMISParser extends Parser {
 
     // $ANTLR start synpred2_CMIS
     public final void synpred2_CMIS_fragment() throws RecognitionException {   
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:216:4: ( tableName )
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:216:5: tableName
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:366:4: ( tableName )
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:366:5: tableName
         {
-        pushFollow(FOLLOW_tableName_in_synpred2_CMIS574);
+        pushFollow(FOLLOW_tableName_in_synpred2_CMIS771);
         tableName();
 
         state._fsp--;
@@ -6688,11 +7237,11 @@ public class CMISParser extends Parser {
 
     // $ANTLR start synpred3_CMIS
     public final void synpred3_CMIS_fragment() throws RecognitionException {   
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:230:17: ( joinedTable )
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:230:18: joinedTable
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:6: ( columnReference )
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:7: columnReference
         {
-        pushFollow(FOLLOW_joinedTable_in_synpred3_CMIS652);
-        joinedTable();
+        pushFollow(FOLLOW_columnReference_in_synpred3_CMIS1592);
+        columnReference();
 
         state._fsp--;
         if (state.failed) return ;
@@ -6701,12 +7250,12 @@ public class CMISParser extends Parser {
     }
     // $ANTLR end synpred3_CMIS
 
-    // $ANTLR start synpred5_CMIS
-    public final void synpred5_CMIS_fragment() throws RecognitionException {   
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:362:6: ( columnReference )
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:362:7: columnReference
+    // $ANTLR start synpred4_CMIS
+    public final void synpred4_CMIS_fragment() throws RecognitionException {   
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:11: ( columnReference )
+        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:12: columnReference
         {
-        pushFollow(FOLLOW_columnReference_in_synpred5_CMIS1338);
+        pushFollow(FOLLOW_columnReference_in_synpred4_CMIS1630);
         columnReference();
 
         state._fsp--;
@@ -6714,22 +7263,7 @@ public class CMISParser extends Parser {
 
         }
     }
-    // $ANTLR end synpred5_CMIS
-
-    // $ANTLR start synpred6_CMIS
-    public final void synpred6_CMIS_fragment() throws RecognitionException {   
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:11: ( columnReference )
-        // W:\\alfresco\\BRANCHES\\DEV\\CMIS063\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:12: columnReference
-        {
-        pushFollow(FOLLOW_columnReference_in_synpred6_CMIS1376);
-        columnReference();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred6_CMIS
+    // $ANTLR end synpred4_CMIS
 
     // Delegated rules
 
@@ -6747,11 +7281,11 @@ public class CMISParser extends Parser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred6_CMIS() {
+    public final boolean synpred4_CMIS() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred6_CMIS_fragment(); // can never throw exception
+            synpred4_CMIS_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -6775,20 +7309,6 @@ public class CMISParser extends Parser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred5_CMIS() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred5_CMIS_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
     public final boolean synpred1_CMIS() {
         state.backtracking++;
         int start = input.mark();
@@ -6808,36 +7328,130 @@ public class CMISParser extends Parser {
     protected DFA7 dfa7 = new DFA7(this);
     protected DFA9 dfa9 = new DFA9(this);
     protected DFA10 dfa10 = new DFA10(this);
-    protected DFA12 dfa12 = new DFA12(this);
-    protected DFA24 dfa24 = new DFA24(this);
+    protected DFA13 dfa13 = new DFA13(this);
+    protected DFA14 dfa14 = new DFA14(this);
+    protected DFA15 dfa15 = new DFA15(this);
     protected DFA26 dfa26 = new DFA26(this);
+    protected DFA27 dfa27 = new DFA27(this);
+    protected DFA28 dfa28 = new DFA28(this);
+    protected DFA36 dfa36 = new DFA36(this);
     protected DFA34 dfa34 = new DFA34(this);
-    protected DFA41 dfa41 = new DFA41(this);
+    protected DFA35 dfa35 = new DFA35(this);
+    protected DFA43 dfa43 = new DFA43(this);
     static final String DFA7_eotS =
-        "\13\uffff";
+        "\134\uffff";
     static final String DFA7_eofS =
-        "\13\uffff";
+        "\134\uffff";
     static final String DFA7_minS =
-        "\1\37\1\43\1\37\3\uffff\2\106\2\43\1\uffff";
+        "\1\37\1\43\1\37\36\uffff\35\106\35\43\1\uffff";
     static final String DFA7_maxS =
-        "\1\113\1\43\1\113\3\uffff\2\106\2\43\1\uffff";
+        "\1\114\1\43\1\114\36\uffff\35\106\35\43\1\uffff";
     static final String DFA7_acceptS =
-        "\3\uffff\1\1\1\2\1\3\4\uffff\1\2";
+        "\3\uffff\34\1\1\2\1\3\72\uffff\1\2";
     static final String DFA7_specialS =
-        "\1\4\1\3\1\6\3\uffff\1\5\1\2\1\1\1\0\1\uffff}>";
+        "\1\74\1\7\1\22\36\uffff\1\71\1\0\1\4\1\12\1\17\1\20\1\13\1\5\1"+
+        "\1\1\72\1\66\1\26\1\24\1\23\1\15\1\10\1\3\1\73\1\67\1\27\1\25\1"+
+        "\11\1\16\1\2\1\6\1\30\1\70\1\14\1\21\1\65\1\64\1\63\1\62\1\61\1"+
+        "\60\1\57\1\56\1\55\1\54\1\53\1\52\1\51\1\50\1\47\1\46\1\45\1\44"+
+        "\1\43\1\42\1\41\1\40\1\37\1\36\1\35\1\34\1\33\1\32\1\31\1\uffff}>";
     static final String[] DFA7_transitionS = {
-            "\1\3\2\uffff\1\3\4\uffff\6\3\1\uffff\4\3\5\uffff\14\3\2\uffff"+
-            "\1\1\1\2\2\uffff\3\3",
-            "\1\4",
-            "\1\6\2\uffff\1\6\4\uffff\6\6\1\uffff\4\6\5\uffff\14\6\2\uffff"+
-            "\1\7\3\uffff\3\6",
+            "\1\4\2\uffff\1\5\4\uffff\1\6\1\7\1\10\1\11\1\12\1\13\1\uffff"+
+            "\1\14\1\15\1\16\1\17\5\uffff\1\20\1\21\1\22\1\23\1\24\1\25\1"+
+            "\26\1\27\1\30\1\31\1\32\1\33\2\uffff\1\1\1\2\2\uffff\1\35\1"+
+            "\36\1\34\1\3",
+            "\1\37",
+            "\1\41\2\uffff\1\42\4\uffff\1\43\1\44\1\45\1\46\1\47\1\50\1"+
+            "\uffff\1\51\1\52\1\53\1\54\5\uffff\1\55\1\56\1\57\1\60\1\61"+
+            "\1\62\1\63\1\64\1\65\1\66\1\67\1\70\2\uffff\1\75\3\uffff\1\72"+
+            "\1\73\1\71\1\74",
             "",
             "",
             "",
-            "\1\10",
-            "\1\11",
-            "\1\12",
-            "\1\12",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "\1\76",
+            "\1\77",
+            "\1\100",
+            "\1\101",
+            "\1\102",
+            "\1\103",
+            "\1\104",
+            "\1\105",
+            "\1\106",
+            "\1\107",
+            "\1\110",
+            "\1\111",
+            "\1\112",
+            "\1\113",
+            "\1\114",
+            "\1\115",
+            "\1\116",
+            "\1\117",
+            "\1\120",
+            "\1\121",
+            "\1\122",
+            "\1\123",
+            "\1\124",
+            "\1\125",
+            "\1\126",
+            "\1\127",
+            "\1\130",
+            "\1\131",
+            "\1\132",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
+            "\1\133",
             ""
     };
 
@@ -6871,77 +7485,969 @@ public class CMISParser extends Parser {
             this.transition = DFA7_transition;
         }
         public String getDescription() {
-            return "173:1: selectSubList : ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->);";
+            return "313:1: selectSubList : ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->);";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA7_9 = input.LA(1);
+                        int LA7_34 = input.LA(1);
 
                          
-                        int index7_9 = input.index();
+                        int index7_34 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA7_9==DOTSTAR) && ((strict == false))) {s = 10;}
-
-                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 3;}
-
-                        else if ( ((strict == false)) ) {s = 5;}
+                        if ( (LA7_34==DOUBLE_QUOTE) && ((strict == false))) {s = 63;}
 
                          
-                        input.seek(index7_9);
+                        input.seek(index7_34);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA7_8 = input.LA(1);
+                        int LA7_41 = input.LA(1);
 
                          
-                        int index7_8 = input.index();
+                        int index7_41 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA7_8==DOTSTAR) && ((strict == false))) {s = 10;}
-
-                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 3;}
-
-                        else if ( ((strict == false)) ) {s = 5;}
+                        if ( (LA7_41==DOUBLE_QUOTE) && ((strict == false))) {s = 70;}
 
                          
-                        input.seek(index7_8);
+                        input.seek(index7_41);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA7_7 = input.LA(1);
+                        int LA7_56 = input.LA(1);
 
                          
-                        int index7_7 = input.index();
+                        int index7_56 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA7_7==DOUBLE_QUOTE) && ((strict == false))) {s = 9;}
+                        if ( (LA7_56==DOUBLE_QUOTE) && ((strict == false))) {s = 85;}
 
                          
-                        input.seek(index7_7);
+                        input.seek(index7_56);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
+                        int LA7_49 = input.LA(1);
+
+                         
+                        int index7_49 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_49==DOUBLE_QUOTE) && ((strict == false))) {s = 78;}
+
+                         
+                        input.seek(index7_49);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA7_35 = input.LA(1);
+
+                         
+                        int index7_35 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_35==DOUBLE_QUOTE) && ((strict == false))) {s = 64;}
+
+                         
+                        input.seek(index7_35);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA7_40 = input.LA(1);
+
+                         
+                        int index7_40 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_40==DOUBLE_QUOTE) && ((strict == false))) {s = 69;}
+
+                         
+                        input.seek(index7_40);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA7_57 = input.LA(1);
+
+                         
+                        int index7_57 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_57==DOUBLE_QUOTE) && ((strict == false))) {s = 86;}
+
+                         
+                        input.seek(index7_57);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
                         int LA7_1 = input.LA(1);
 
                          
                         int index7_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA7_1==DOTSTAR) ) {s = 4;}
+                        if ( (LA7_1==DOTSTAR) ) {s = 31;}
 
-                        else if ( (synpred1_CMIS()) ) {s = 3;}
+                        else if ( (((synpred1_CMIS()&&(strict == false))||synpred1_CMIS())) ) {s = 30;}
 
-                        else if ( (true) ) {s = 5;}
+                        else if ( (true) ) {s = 32;}
 
                          
                         input.seek(index7_1);
                         if ( s>=0 ) return s;
                         break;
-                    case 4 : 
+                    case 8 : 
+                        int LA7_48 = input.LA(1);
+
+                         
+                        int index7_48 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_48==DOUBLE_QUOTE) && ((strict == false))) {s = 77;}
+
+                         
+                        input.seek(index7_48);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA7_54 = input.LA(1);
+
+                         
+                        int index7_54 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_54==DOUBLE_QUOTE) && ((strict == false))) {s = 83;}
+
+                         
+                        input.seek(index7_54);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA7_36 = input.LA(1);
+
+                         
+                        int index7_36 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_36==DOUBLE_QUOTE) && ((strict == false))) {s = 65;}
+
+                         
+                        input.seek(index7_36);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA7_39 = input.LA(1);
+
+                         
+                        int index7_39 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_39==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
+
+                         
+                        input.seek(index7_39);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA7_60 = input.LA(1);
+
+                         
+                        int index7_60 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_60==DOUBLE_QUOTE) && ((strict == false))) {s = 89;}
+
+                         
+                        input.seek(index7_60);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA7_47 = input.LA(1);
+
+                         
+                        int index7_47 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_47==DOUBLE_QUOTE) && ((strict == false))) {s = 76;}
+
+                         
+                        input.seek(index7_47);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA7_55 = input.LA(1);
+
+                         
+                        int index7_55 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_55==DOUBLE_QUOTE) && ((strict == false))) {s = 84;}
+
+                         
+                        input.seek(index7_55);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA7_37 = input.LA(1);
+
+                         
+                        int index7_37 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_37==DOUBLE_QUOTE) && ((strict == false))) {s = 66;}
+
+                         
+                        input.seek(index7_37);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA7_38 = input.LA(1);
+
+                         
+                        int index7_38 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_38==DOUBLE_QUOTE) && ((strict == false))) {s = 67;}
+
+                         
+                        input.seek(index7_38);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA7_61 = input.LA(1);
+
+                         
+                        int index7_61 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_61==DOUBLE_QUOTE) && ((strict == false))) {s = 90;}
+
+                         
+                        input.seek(index7_61);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
+                        int LA7_2 = input.LA(1);
+
+                         
+                        int index7_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_2==SELECT) && ((strict == false))) {s = 33;}
+
+                        else if ( (LA7_2==AS) && ((strict == false))) {s = 34;}
+
+                        else if ( (LA7_2==FROM) && ((strict == false))) {s = 35;}
+
+                        else if ( (LA7_2==JOIN) && ((strict == false))) {s = 36;}
+
+                        else if ( (LA7_2==INNER) && ((strict == false))) {s = 37;}
+
+                        else if ( (LA7_2==LEFT) && ((strict == false))) {s = 38;}
+
+                        else if ( (LA7_2==OUTER) && ((strict == false))) {s = 39;}
+
+                        else if ( (LA7_2==ON) && ((strict == false))) {s = 40;}
+
+                        else if ( (LA7_2==WHERE) && ((strict == false))) {s = 41;}
+
+                        else if ( (LA7_2==OR) && ((strict == false))) {s = 42;}
+
+                        else if ( (LA7_2==AND) && ((strict == false))) {s = 43;}
+
+                        else if ( (LA7_2==NOT) && ((strict == false))) {s = 44;}
+
+                        else if ( (LA7_2==IN) && ((strict == false))) {s = 45;}
+
+                        else if ( (LA7_2==LIKE) && ((strict == false))) {s = 46;}
+
+                        else if ( (LA7_2==IS) && ((strict == false))) {s = 47;}
+
+                        else if ( (LA7_2==NULL) && ((strict == false))) {s = 48;}
+
+                        else if ( (LA7_2==ANY) && ((strict == false))) {s = 49;}
+
+                        else if ( (LA7_2==CONTAINS) && ((strict == false))) {s = 50;}
+
+                        else if ( (LA7_2==IN_FOLDER) && ((strict == false))) {s = 51;}
+
+                        else if ( (LA7_2==IN_TREE) && ((strict == false))) {s = 52;}
+
+                        else if ( (LA7_2==ORDER) && ((strict == false))) {s = 53;}
+
+                        else if ( (LA7_2==BY) && ((strict == false))) {s = 54;}
+
+                        else if ( (LA7_2==ASC) && ((strict == false))) {s = 55;}
+
+                        else if ( (LA7_2==DESC) && ((strict == false))) {s = 56;}
+
+                        else if ( (LA7_2==TIMESTAMP) && ((strict == false))) {s = 57;}
+
+                        else if ( (LA7_2==TRUE) && ((strict == false))) {s = 58;}
+
+                        else if ( (LA7_2==FALSE) && ((strict == false))) {s = 59;}
+
+                        else if ( (LA7_2==SCORE) && ((strict == false))) {s = 60;}
+
+                        else if ( (LA7_2==ID) && ((strict == false))) {s = 61;}
+
+                         
+                        input.seek(index7_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 19 : 
+                        int LA7_46 = input.LA(1);
+
+                         
+                        int index7_46 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_46==DOUBLE_QUOTE) && ((strict == false))) {s = 75;}
+
+                         
+                        input.seek(index7_46);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA7_45 = input.LA(1);
+
+                         
+                        int index7_45 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_45==DOUBLE_QUOTE) && ((strict == false))) {s = 74;}
+
+                         
+                        input.seek(index7_45);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA7_53 = input.LA(1);
+
+                         
+                        int index7_53 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_53==DOUBLE_QUOTE) && ((strict == false))) {s = 82;}
+
+                         
+                        input.seek(index7_53);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA7_44 = input.LA(1);
+
+                         
+                        int index7_44 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_44==DOUBLE_QUOTE) && ((strict == false))) {s = 73;}
+
+                         
+                        input.seek(index7_44);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA7_52 = input.LA(1);
+
+                         
+                        int index7_52 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_52==DOUBLE_QUOTE) && ((strict == false))) {s = 81;}
+
+                         
+                        input.seek(index7_52);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA7_58 = input.LA(1);
+
+                         
+                        int index7_58 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_58==DOUBLE_QUOTE) && ((strict == false))) {s = 87;}
+
+                         
+                        input.seek(index7_58);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA7_90 = input.LA(1);
+
+                         
+                        int index7_90 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_90==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_90);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA7_89 = input.LA(1);
+
+                         
+                        int index7_89 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_89==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_89);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA7_88 = input.LA(1);
+
+                         
+                        int index7_88 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_88==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_88);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA7_87 = input.LA(1);
+
+                         
+                        int index7_87 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_87==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_87);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA7_86 = input.LA(1);
+
+                         
+                        int index7_86 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_86==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_86);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA7_85 = input.LA(1);
+
+                         
+                        int index7_85 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_85==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_85);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA7_84 = input.LA(1);
+
+                         
+                        int index7_84 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_84==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_84);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 32 : 
+                        int LA7_83 = input.LA(1);
+
+                         
+                        int index7_83 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_83==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_83);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 33 : 
+                        int LA7_82 = input.LA(1);
+
+                         
+                        int index7_82 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_82==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_82);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 34 : 
+                        int LA7_81 = input.LA(1);
+
+                         
+                        int index7_81 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_81==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_81);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 35 : 
+                        int LA7_80 = input.LA(1);
+
+                         
+                        int index7_80 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_80==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_80);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 36 : 
+                        int LA7_79 = input.LA(1);
+
+                         
+                        int index7_79 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_79==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_79);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 37 : 
+                        int LA7_78 = input.LA(1);
+
+                         
+                        int index7_78 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_78==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_78);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 38 : 
+                        int LA7_77 = input.LA(1);
+
+                         
+                        int index7_77 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_77==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_77);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 39 : 
+                        int LA7_76 = input.LA(1);
+
+                         
+                        int index7_76 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_76==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_76);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 40 : 
+                        int LA7_75 = input.LA(1);
+
+                         
+                        int index7_75 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_75==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_75);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 41 : 
+                        int LA7_74 = input.LA(1);
+
+                         
+                        int index7_74 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_74==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_74);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 42 : 
+                        int LA7_73 = input.LA(1);
+
+                         
+                        int index7_73 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_73==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_73);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 43 : 
+                        int LA7_72 = input.LA(1);
+
+                         
+                        int index7_72 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_72==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_72);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 44 : 
+                        int LA7_71 = input.LA(1);
+
+                         
+                        int index7_71 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_71==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_71);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 45 : 
+                        int LA7_70 = input.LA(1);
+
+                         
+                        int index7_70 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_70==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_70);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 46 : 
+                        int LA7_69 = input.LA(1);
+
+                         
+                        int index7_69 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_69==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_69);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 47 : 
+                        int LA7_68 = input.LA(1);
+
+                         
+                        int index7_68 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_68==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_68);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 48 : 
+                        int LA7_67 = input.LA(1);
+
+                         
+                        int index7_67 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_67==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_67);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 49 : 
+                        int LA7_66 = input.LA(1);
+
+                         
+                        int index7_66 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_66==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_66);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 50 : 
+                        int LA7_65 = input.LA(1);
+
+                         
+                        int index7_65 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_65==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_65);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 51 : 
+                        int LA7_64 = input.LA(1);
+
+                         
+                        int index7_64 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_64==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_64);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 52 : 
+                        int LA7_63 = input.LA(1);
+
+                         
+                        int index7_63 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_63==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_63);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 53 : 
+                        int LA7_62 = input.LA(1);
+
+                         
+                        int index7_62 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_62==DOTSTAR) && ((strict == false))) {s = 91;}
+
+                        else if ( (((synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false))||(synpred1_CMIS()&&(strict == false)))) ) {s = 30;}
+
+                        else if ( ((strict == false)) ) {s = 32;}
+
+                         
+                        input.seek(index7_62);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 54 : 
+                        int LA7_43 = input.LA(1);
+
+                         
+                        int index7_43 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_43==DOUBLE_QUOTE) && ((strict == false))) {s = 72;}
+
+                         
+                        input.seek(index7_43);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 55 : 
+                        int LA7_51 = input.LA(1);
+
+                         
+                        int index7_51 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_51==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
+
+                         
+                        input.seek(index7_51);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 56 : 
+                        int LA7_59 = input.LA(1);
+
+                         
+                        int index7_59 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_59==DOUBLE_QUOTE) && ((strict == false))) {s = 88;}
+
+                         
+                        input.seek(index7_59);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 57 : 
+                        int LA7_33 = input.LA(1);
+
+                         
+                        int index7_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_33==DOUBLE_QUOTE) && ((strict == false))) {s = 62;}
+
+                         
+                        input.seek(index7_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 58 : 
+                        int LA7_42 = input.LA(1);
+
+                         
+                        int index7_42 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_42==DOUBLE_QUOTE) && ((strict == false))) {s = 71;}
+
+                         
+                        input.seek(index7_42);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 59 : 
+                        int LA7_50 = input.LA(1);
+
+                         
+                        int index7_50 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA7_50==DOUBLE_QUOTE) && ((strict == false))) {s = 79;}
+
+                         
+                        input.seek(index7_50);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 60 : 
                         int LA7_0 = input.LA(1);
 
                          
@@ -6952,40 +8458,66 @@ public class CMISParser extends Parser {
 
                         else if ( (LA7_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
 
-                        else if ( (LA7_0==SELECT||LA7_0==AS||(LA7_0>=FROM && LA7_0<=ON)||(LA7_0>=WHERE && LA7_0<=NOT)||(LA7_0>=IN && LA7_0<=DESC)||(LA7_0>=TRUE && LA7_0<=TIMESTAMP)) && (synpred1_CMIS())) {s = 3;}
+                        else if ( (LA7_0==SCORE) && (((synpred1_CMIS()&&(strict == false))||synpred1_CMIS()))) {s = 3;}
+
+                        else if ( (LA7_0==SELECT) && ((synpred1_CMIS()&&(strict == false)))) {s = 4;}
+
+                        else if ( (LA7_0==AS) && ((synpred1_CMIS()&&(strict == false)))) {s = 5;}
+
+                        else if ( (LA7_0==FROM) && ((synpred1_CMIS()&&(strict == false)))) {s = 6;}
+
+                        else if ( (LA7_0==JOIN) && ((synpred1_CMIS()&&(strict == false)))) {s = 7;}
+
+                        else if ( (LA7_0==INNER) && ((synpred1_CMIS()&&(strict == false)))) {s = 8;}
+
+                        else if ( (LA7_0==LEFT) && ((synpred1_CMIS()&&(strict == false)))) {s = 9;}
+
+                        else if ( (LA7_0==OUTER) && ((synpred1_CMIS()&&(strict == false)))) {s = 10;}
+
+                        else if ( (LA7_0==ON) && ((synpred1_CMIS()&&(strict == false)))) {s = 11;}
+
+                        else if ( (LA7_0==WHERE) && ((synpred1_CMIS()&&(strict == false)))) {s = 12;}
+
+                        else if ( (LA7_0==OR) && ((synpred1_CMIS()&&(strict == false)))) {s = 13;}
+
+                        else if ( (LA7_0==AND) && ((synpred1_CMIS()&&(strict == false)))) {s = 14;}
+
+                        else if ( (LA7_0==NOT) && ((synpred1_CMIS()&&(strict == false)))) {s = 15;}
+
+                        else if ( (LA7_0==IN) && ((synpred1_CMIS()&&(strict == false)))) {s = 16;}
+
+                        else if ( (LA7_0==LIKE) && ((synpred1_CMIS()&&(strict == false)))) {s = 17;}
+
+                        else if ( (LA7_0==IS) && ((synpred1_CMIS()&&(strict == false)))) {s = 18;}
+
+                        else if ( (LA7_0==NULL) && ((synpred1_CMIS()&&(strict == false)))) {s = 19;}
+
+                        else if ( (LA7_0==ANY) && ((synpred1_CMIS()&&(strict == false)))) {s = 20;}
+
+                        else if ( (LA7_0==CONTAINS) && ((synpred1_CMIS()&&(strict == false)))) {s = 21;}
+
+                        else if ( (LA7_0==IN_FOLDER) && ((synpred1_CMIS()&&(strict == false)))) {s = 22;}
+
+                        else if ( (LA7_0==IN_TREE) && ((synpred1_CMIS()&&(strict == false)))) {s = 23;}
+
+                        else if ( (LA7_0==ORDER) && ((synpred1_CMIS()&&(strict == false)))) {s = 24;}
+
+                        else if ( (LA7_0==BY) && ((synpred1_CMIS()&&(strict == false)))) {s = 25;}
+
+                        else if ( (LA7_0==ASC) && ((synpred1_CMIS()&&(strict == false)))) {s = 26;}
+
+                        else if ( (LA7_0==DESC) && ((synpred1_CMIS()&&(strict == false)))) {s = 27;}
+
+                        else if ( (LA7_0==TIMESTAMP) && ((synpred1_CMIS()&&(strict == false)))) {s = 28;}
+
+                        else if ( (LA7_0==TRUE) && ((synpred1_CMIS()&&(strict == false)))) {s = 29;}
+
+                        else if ( (LA7_0==FALSE) && ((synpred1_CMIS()&&(strict == false)))) {s = 30;}
 
                          
                         input.seek(index7_0);
                         if ( s>=0 ) return s;
                         break;
-                    case 5 : 
-                        int LA7_6 = input.LA(1);
-
-                         
-                        int index7_6 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_6==DOUBLE_QUOTE) && ((strict == false))) {s = 8;}
-
-                         
-                        input.seek(index7_6);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA7_2 = input.LA(1);
-
-                         
-                        int index7_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_2==SELECT||LA7_2==AS||(LA7_2>=FROM && LA7_2<=ON)||(LA7_2>=WHERE && LA7_2<=NOT)||(LA7_2>=IN && LA7_2<=DESC)||(LA7_2>=TRUE && LA7_2<=TIMESTAMP)) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA7_2==ID) && ((strict == false))) {s = 7;}
-
-                         
-                        input.seek(index7_2);
-                        if ( s>=0 ) return s;
-                        break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
@@ -6995,29 +8527,60 @@ public class CMISParser extends Parser {
         }
     }
     static final String DFA9_eotS =
-        "\12\uffff";
+        "\45\uffff";
     static final String DFA9_eofS =
-        "\1\uffff\1\3\5\uffff\1\10\2\uffff";
+        "\1\uffff\1\3\40\uffff\1\44\2\uffff";
     static final String DFA9_minS =
-        "\1\105\1\41\1\37\2\uffff\2\106\1\41\2\uffff";
+        "\1\105\1\41\1\37\2\uffff\35\106\1\41\2\uffff";
     static final String DFA9_maxS =
-        "\2\106\1\113\2\uffff\3\106\2\uffff";
+        "\2\106\1\114\2\uffff\36\106\2\uffff";
     static final String DFA9_acceptS =
-        "\3\uffff\1\2\1\1\3\uffff\1\2\1\1";
+        "\3\uffff\1\2\1\1\36\uffff\1\1\1\2";
     static final String DFA9_specialS =
-        "\1\2\1\uffff\1\0\2\uffff\1\3\1\4\1\1\2\uffff}>";
+        "\1\0\1\uffff\1\27\2\uffff\1\30\1\22\1\15\1\12\1\14\1\7\1\1\1\34"+
+        "\1\32\1\35\1\21\1\31\1\26\1\11\1\17\1\5\1\3\1\6\1\33\1\36\1\37\1"+
+        "\23\1\25\1\10\1\13\1\16\1\2\1\24\1\20\1\4\2\uffff}>";
     static final String[] DFA9_transitionS = {
             "\1\1\1\2",
             "\2\3\1\uffff\1\4\1\uffff\5\3\1\uffff\3\3\2\uffff\11\3\5\uffff"+
             "\1\3\1\uffff\2\3\2\uffff\2\3",
-            "\1\5\2\uffff\1\5\4\uffff\6\5\1\uffff\4\5\5\uffff\14\5\2\uffff"+
-            "\1\6\3\uffff\3\5",
+            "\1\5\2\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\uffff"+
+            "\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1"+
+            "\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\41\3\uffff\1\36\1\37"+
+            "\1\35\1\40",
             "",
             "",
-            "\1\7",
-            "\1\7",
-            "\2\10\1\uffff\1\11\1\uffff\5\10\1\uffff\3\10\2\uffff\11\10"+
-            "\5\uffff\1\10\1\uffff\2\10\2\uffff\2\10",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\2\44\1\uffff\1\43\1\uffff\5\44\1\uffff\3\44\2\uffff\11\44"+
+            "\5\uffff\1\44\1\uffff\2\44\2\uffff\2\44",
             "",
             ""
     };
@@ -7052,43 +8615,13 @@ public class CMISParser extends Parser {
             this.transition = DFA9_transition;
         }
         public String getDescription() {
-            return "190:4: ( qualifier DOT )?";
+            return "334:4: ( qualifier DOT )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA9_2 = input.LA(1);
-
-                         
-                        int index9_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_2==SELECT||LA9_2==AS||(LA9_2>=FROM && LA9_2<=ON)||(LA9_2>=WHERE && LA9_2<=NOT)||(LA9_2>=IN && LA9_2<=DESC)||(LA9_2>=TRUE && LA9_2<=TIMESTAMP)) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA9_2==ID) && ((strict == false))) {s = 6;}
-
-                         
-                        input.seek(index9_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA9_7 = input.LA(1);
-
-                         
-                        int index9_7 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_7==EOF||(LA9_7>=COMMA && LA9_7<=AS)||(LA9_7>=RPAREN && LA9_7<=LEFT)||(LA9_7>=ON && LA9_7<=WHERE)||(LA9_7>=NOT && LA9_7<=IS)||LA9_7==ORDER||(LA9_7>=ASC && LA9_7<=DESC)||(LA9_7>=ID && LA9_7<=DOUBLE_QUOTE)) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA9_7==DOT) && ((strict == false))) {s = 9;}
-
-                         
-                        input.seek(index9_7);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
                         int LA9_0 = input.LA(1);
 
                          
@@ -7103,32 +8636,467 @@ public class CMISParser extends Parser {
                         input.seek(index9_0);
                         if ( s>=0 ) return s;
                         break;
-                    case 3 : 
-                        int LA9_5 = input.LA(1);
+                    case 1 : 
+                        int LA9_11 = input.LA(1);
 
                          
-                        int index9_5 = input.index();
+                        int index9_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA9_5==DOUBLE_QUOTE) && ((strict == false))) {s = 7;}
+                        if ( (LA9_11==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
 
                          
-                        input.seek(index9_5);
+                        input.seek(index9_11);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA9_31 = input.LA(1);
+
+                         
+                        int index9_31 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_31==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_31);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA9_21 = input.LA(1);
+
+                         
+                        int index9_21 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_21==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_21);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
+                        int LA9_34 = input.LA(1);
+
+                         
+                        int index9_34 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_34==DOT) && ((strict == false))) {s = 35;}
+
+                        else if ( (LA9_34==EOF||(LA9_34>=COMMA && LA9_34<=AS)||(LA9_34>=RPAREN && LA9_34<=LEFT)||(LA9_34>=ON && LA9_34<=WHERE)||(LA9_34>=NOT && LA9_34<=IS)||LA9_34==ORDER||(LA9_34>=ASC && LA9_34<=DESC)||(LA9_34>=ID && LA9_34<=DOUBLE_QUOTE)) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index9_34);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA9_20 = input.LA(1);
+
+                         
+                        int index9_20 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_20==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_20);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA9_22 = input.LA(1);
+
+                         
+                        int index9_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_22==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA9_10 = input.LA(1);
+
+                         
+                        int index9_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_10==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA9_28 = input.LA(1);
+
+                         
+                        int index9_28 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_28==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_28);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA9_18 = input.LA(1);
+
+                         
+                        int index9_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_18==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA9_8 = input.LA(1);
+
+                         
+                        int index9_8 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_8==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_8);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA9_29 = input.LA(1);
+
+                         
+                        int index9_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_29==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA9_9 = input.LA(1);
+
+                         
+                        int index9_9 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_9==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_9);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA9_7 = input.LA(1);
+
+                         
+                        int index9_7 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_7==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_7);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA9_30 = input.LA(1);
+
+                         
+                        int index9_30 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_30==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_30);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA9_19 = input.LA(1);
+
+                         
+                        int index9_19 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_19==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_19);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA9_33 = input.LA(1);
+
+                         
+                        int index9_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_33==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA9_15 = input.LA(1);
+
+                         
+                        int index9_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_15==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_15);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
                         int LA9_6 = input.LA(1);
 
                          
                         int index9_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA9_6==DOUBLE_QUOTE) && ((strict == false))) {s = 7;}
+                        if ( (LA9_6==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
 
                          
                         input.seek(index9_6);
                         if ( s>=0 ) return s;
                         break;
+                    case 19 : 
+                        int LA9_26 = input.LA(1);
+
+                         
+                        int index9_26 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_26==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_26);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA9_32 = input.LA(1);
+
+                         
+                        int index9_32 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_32==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_32);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA9_27 = input.LA(1);
+
+                         
+                        int index9_27 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_27==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_27);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA9_17 = input.LA(1);
+
+                         
+                        int index9_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_17==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA9_2 = input.LA(1);
+
+                         
+                        int index9_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_2==SELECT) && ((strict == false))) {s = 5;}
+
+                        else if ( (LA9_2==AS) && ((strict == false))) {s = 6;}
+
+                        else if ( (LA9_2==FROM) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA9_2==JOIN) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA9_2==INNER) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA9_2==LEFT) && ((strict == false))) {s = 10;}
+
+                        else if ( (LA9_2==OUTER) && ((strict == false))) {s = 11;}
+
+                        else if ( (LA9_2==ON) && ((strict == false))) {s = 12;}
+
+                        else if ( (LA9_2==WHERE) && ((strict == false))) {s = 13;}
+
+                        else if ( (LA9_2==OR) && ((strict == false))) {s = 14;}
+
+                        else if ( (LA9_2==AND) && ((strict == false))) {s = 15;}
+
+                        else if ( (LA9_2==NOT) && ((strict == false))) {s = 16;}
+
+                        else if ( (LA9_2==IN) && ((strict == false))) {s = 17;}
+
+                        else if ( (LA9_2==LIKE) && ((strict == false))) {s = 18;}
+
+                        else if ( (LA9_2==IS) && ((strict == false))) {s = 19;}
+
+                        else if ( (LA9_2==NULL) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA9_2==ANY) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA9_2==CONTAINS) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA9_2==IN_FOLDER) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA9_2==IN_TREE) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA9_2==ORDER) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA9_2==BY) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA9_2==ASC) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA9_2==DESC) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA9_2==TIMESTAMP) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA9_2==TRUE) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA9_2==FALSE) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA9_2==SCORE) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA9_2==ID) && ((strict == false))) {s = 33;}
+
+                         
+                        input.seek(index9_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA9_5 = input.LA(1);
+
+                         
+                        int index9_5 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_5==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_5);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA9_16 = input.LA(1);
+
+                         
+                        int index9_16 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_16==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_16);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA9_13 = input.LA(1);
+
+                         
+                        int index9_13 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_13==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA9_23 = input.LA(1);
+
+                         
+                        int index9_23 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_23==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_23);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA9_12 = input.LA(1);
+
+                         
+                        int index9_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_12==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA9_14 = input.LA(1);
+
+                         
+                        int index9_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_14==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA9_24 = input.LA(1);
+
+                         
+                        int index9_24 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_24==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_24);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA9_25 = input.LA(1);
+
+                         
+                        int index9_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA9_25==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index9_25);
+                        if ( s>=0 ) return s;
+                        break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
@@ -7138,29 +9106,60 @@ public class CMISParser extends Parser {
         }
     }
     static final String DFA10_eotS =
-        "\12\uffff";
+        "\45\uffff";
     static final String DFA10_eofS =
-        "\1\uffff\1\4\5\uffff\1\10\2\uffff";
+        "\1\uffff\1\4\40\uffff\1\44\2\uffff";
     static final String DFA10_minS =
-        "\1\105\1\41\1\37\2\uffff\2\106\1\41\2\uffff";
+        "\1\105\1\41\1\37\2\uffff\35\106\1\41\2\uffff";
     static final String DFA10_maxS =
-        "\1\106\1\77\1\113\2\uffff\2\106\1\77\2\uffff";
+        "\1\106\1\77\1\114\2\uffff\35\106\1\77\2\uffff";
     static final String DFA10_acceptS =
-        "\3\uffff\1\1\1\2\3\uffff\1\2\1\1";
+        "\3\uffff\1\1\1\2\36\uffff\1\1\1\2";
     static final String DFA10_specialS =
-        "\1\3\1\uffff\1\0\2\uffff\1\2\1\4\1\1\2\uffff}>";
+        "\1\20\1\uffff\1\27\2\uffff\1\30\1\22\1\14\1\10\1\13\1\5\1\0\1\34"+
+        "\1\32\1\35\1\21\1\31\1\26\1\7\1\16\1\3\1\2\1\4\1\33\1\36\1\37\1"+
+        "\23\1\25\1\6\1\12\1\15\1\1\1\24\1\17\1\11\2\uffff}>";
     static final String[] DFA10_transitionS = {
             "\1\1\1\2",
             "\1\4\2\uffff\1\3\1\uffff\2\4\7\uffff\3\4\5\uffff\1\4\1\uffff"+
             "\1\4\5\uffff\1\4",
-            "\1\5\2\uffff\1\5\4\uffff\6\5\1\uffff\4\5\5\uffff\14\5\2\uffff"+
-            "\1\6\3\uffff\3\5",
+            "\1\5\2\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\uffff"+
+            "\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1"+
+            "\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\41\3\uffff\1\36\1\37"+
+            "\1\35\1\40",
             "",
             "",
-            "\1\7",
-            "\1\7",
-            "\1\10\2\uffff\1\11\1\uffff\2\10\7\uffff\3\10\5\uffff\1\10"+
-            "\1\uffff\1\10\5\uffff\1\10",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\44\2\uffff\1\43\1\uffff\2\44\7\uffff\3\44\5\uffff\1\44"+
+            "\1\uffff\1\44\5\uffff\1\44",
             "",
             ""
     };
@@ -7195,56 +9194,223 @@ public class CMISParser extends Parser {
             this.transition = DFA10_transition;
         }
         public String getDescription() {
-            return "199:10: ( qualifier DOT )?";
+            return "345:10: ( qualifier DOT )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA10_2 = input.LA(1);
+                        int LA10_11 = input.LA(1);
 
                          
-                        int index10_2 = input.index();
+                        int index10_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA10_2==SELECT||LA10_2==AS||(LA10_2>=FROM && LA10_2<=ON)||(LA10_2>=WHERE && LA10_2<=NOT)||(LA10_2>=IN && LA10_2<=DESC)||(LA10_2>=TRUE && LA10_2<=TIMESTAMP)) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA10_2==ID) && ((strict == false))) {s = 6;}
+                        if ( (LA10_11==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
 
                          
-                        input.seek(index10_2);
+                        input.seek(index10_11);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
+                        int LA10_31 = input.LA(1);
+
+                         
+                        int index10_31 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_31==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_31);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA10_21 = input.LA(1);
+
+                         
+                        int index10_21 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_21==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_21);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA10_20 = input.LA(1);
+
+                         
+                        int index10_20 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_20==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_20);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA10_22 = input.LA(1);
+
+                         
+                        int index10_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_22==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA10_10 = input.LA(1);
+
+                         
+                        int index10_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_10==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA10_28 = input.LA(1);
+
+                         
+                        int index10_28 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_28==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_28);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA10_18 = input.LA(1);
+
+                         
+                        int index10_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_18==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA10_8 = input.LA(1);
+
+                         
+                        int index10_8 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_8==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_8);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA10_34 = input.LA(1);
+
+                         
+                        int index10_34 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_34==DOT) && ((strict == false))) {s = 35;}
+
+                        else if ( (LA10_34==EOF||LA10_34==COMMA||(LA10_34>=RPAREN && LA10_34<=FROM)||(LA10_34>=OR && LA10_34<=NOT)||LA10_34==IN||LA10_34==IS||LA10_34==ORDER) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index10_34);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA10_29 = input.LA(1);
+
+                         
+                        int index10_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_29==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA10_9 = input.LA(1);
+
+                         
+                        int index10_9 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_9==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_9);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
                         int LA10_7 = input.LA(1);
 
                          
                         int index10_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA10_7==EOF||LA10_7==COMMA||(LA10_7>=RPAREN && LA10_7<=FROM)||(LA10_7>=OR && LA10_7<=NOT)||LA10_7==IN||LA10_7==IS||LA10_7==ORDER) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA10_7==DOT) && ((strict == false))) {s = 9;}
+                        if ( (LA10_7==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
 
                          
                         input.seek(index10_7);
                         if ( s>=0 ) return s;
                         break;
-                    case 2 : 
-                        int LA10_5 = input.LA(1);
+                    case 13 : 
+                        int LA10_30 = input.LA(1);
 
                          
-                        int index10_5 = input.index();
+                        int index10_30 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA10_5==DOUBLE_QUOTE) && ((strict == false))) {s = 7;}
+                        if ( (LA10_30==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
 
                          
-                        input.seek(index10_5);
+                        input.seek(index10_30);
                         if ( s>=0 ) return s;
                         break;
-                    case 3 : 
+                    case 14 : 
+                        int LA10_19 = input.LA(1);
+
+                         
+                        int index10_19 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_19==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_19);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA10_33 = input.LA(1);
+
+                         
+                        int index10_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_33==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
                         int LA10_0 = input.LA(1);
 
                          
@@ -7259,19 +9425,257 @@ public class CMISParser extends Parser {
                         input.seek(index10_0);
                         if ( s>=0 ) return s;
                         break;
-                    case 4 : 
+                    case 17 : 
+                        int LA10_15 = input.LA(1);
+
+                         
+                        int index10_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_15==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_15);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
                         int LA10_6 = input.LA(1);
 
                          
                         int index10_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA10_6==DOUBLE_QUOTE) && ((strict == false))) {s = 7;}
+                        if ( (LA10_6==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
 
                          
                         input.seek(index10_6);
                         if ( s>=0 ) return s;
                         break;
+                    case 19 : 
+                        int LA10_26 = input.LA(1);
+
+                         
+                        int index10_26 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_26==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_26);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA10_32 = input.LA(1);
+
+                         
+                        int index10_32 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_32==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_32);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA10_27 = input.LA(1);
+
+                         
+                        int index10_27 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_27==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_27);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA10_17 = input.LA(1);
+
+                         
+                        int index10_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_17==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA10_2 = input.LA(1);
+
+                         
+                        int index10_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_2==SELECT) && ((strict == false))) {s = 5;}
+
+                        else if ( (LA10_2==AS) && ((strict == false))) {s = 6;}
+
+                        else if ( (LA10_2==FROM) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA10_2==JOIN) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA10_2==INNER) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA10_2==LEFT) && ((strict == false))) {s = 10;}
+
+                        else if ( (LA10_2==OUTER) && ((strict == false))) {s = 11;}
+
+                        else if ( (LA10_2==ON) && ((strict == false))) {s = 12;}
+
+                        else if ( (LA10_2==WHERE) && ((strict == false))) {s = 13;}
+
+                        else if ( (LA10_2==OR) && ((strict == false))) {s = 14;}
+
+                        else if ( (LA10_2==AND) && ((strict == false))) {s = 15;}
+
+                        else if ( (LA10_2==NOT) && ((strict == false))) {s = 16;}
+
+                        else if ( (LA10_2==IN) && ((strict == false))) {s = 17;}
+
+                        else if ( (LA10_2==LIKE) && ((strict == false))) {s = 18;}
+
+                        else if ( (LA10_2==IS) && ((strict == false))) {s = 19;}
+
+                        else if ( (LA10_2==NULL) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA10_2==ANY) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA10_2==CONTAINS) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA10_2==IN_FOLDER) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA10_2==IN_TREE) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA10_2==ORDER) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA10_2==BY) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA10_2==ASC) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA10_2==DESC) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA10_2==TIMESTAMP) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA10_2==TRUE) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA10_2==FALSE) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA10_2==SCORE) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA10_2==ID) && ((strict == false))) {s = 33;}
+
+                         
+                        input.seek(index10_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA10_5 = input.LA(1);
+
+                         
+                        int index10_5 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_5==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_5);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA10_16 = input.LA(1);
+
+                         
+                        int index10_16 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_16==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_16);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA10_13 = input.LA(1);
+
+                         
+                        int index10_13 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_13==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA10_23 = input.LA(1);
+
+                         
+                        int index10_23 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_23==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_23);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA10_12 = input.LA(1);
+
+                         
+                        int index10_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_12==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA10_14 = input.LA(1);
+
+                         
+                        int index10_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_14==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA10_24 = input.LA(1);
+
+                         
+                        int index10_24 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_24==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_24);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA10_25 = input.LA(1);
+
+                         
+                        int index10_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA10_25==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index10_25);
+                        if ( s>=0 ) return s;
+                        break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
@@ -7280,371 +9684,1736 @@ public class CMISParser extends Parser {
             throw nvae;
         }
     }
-    static final String DFA12_eotS =
-        "\14\uffff";
-    static final String DFA12_eofS =
-        "\14\uffff";
-    static final String DFA12_minS =
-        "\1\103\1\44\1\37\4\uffff\2\106\1\44\2\uffff";
-    static final String DFA12_maxS =
-        "\3\113\4\uffff\2\106\1\113\2\uffff";
-    static final String DFA12_acceptS =
-        "\3\uffff\2\3\1\2\1\1\3\uffff\1\1\1\2";
-    static final String DFA12_specialS =
-        "\1\0\1\uffff\1\1\4\uffff\1\3\1\4\1\2\2\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\1\4\1\3\1\1\1\2\5\3",
-            "\1\6\1\uffff\1\5\34\uffff\11\5",
-            "\1\7\2\uffff\1\7\4\uffff\6\7\1\uffff\4\7\5\uffff\14\7\2\uffff"+
-            "\1\10\3\uffff\3\7",
+    static final String DFA13_eotS =
+        "\173\uffff";
+    static final String DFA13_eofS =
+        "\173\uffff";
+    static final String DFA13_minS =
+        "\1\37\1\45\1\uffff\1\46\1\44\1\37\5\46\1\104\1\105\2\0\1\105\35"+
+        "\106\5\0\2\46\1\37\1\uffff\1\46\1\37\1\44\2\0\35\106\1\0\35\106"+
+        "\1\0\2\46\2\0";
+    static final String DFA13_maxS =
+        "\1\114\1\45\1\uffff\2\113\1\114\5\113\1\104\1\106\2\0\36\106\5"+
+        "\0\2\113\1\114\1\uffff\1\113\1\114\1\113\2\0\35\106\1\0\35\106\1"+
+        "\0\2\113\2\0";
+    static final String DFA13_acceptS =
+        "\2\uffff\1\2\62\uffff\1\1\105\uffff";
+    static final String DFA13_specialS =
+        "\1\0\14\uffff\1\10\1\11\36\uffff\1\7\1\6\1\5\1\4\1\12\7\uffff\1"+
+        "\13\1\14\35\uffff\1\15\35\uffff\1\3\2\uffff\1\2\1\1}>";
+    static final String[] DFA13_transitionS = {
+            "\1\2\2\uffff\1\2\4\uffff\6\2\1\uffff\4\2\5\uffff\14\2\2\uffff"+
+            "\1\2\3\uffff\3\2\1\1",
+            "\1\3",
             "",
+            "\1\15\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\17\1\uffff\1\16\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11"+
+            "\1\12\1\13",
+            "\1\20\2\uffff\1\21\4\uffff\1\22\1\23\1\24\1\25\1\26\1\27\1"+
+            "\uffff\1\30\1\31\1\32\1\33\5\uffff\1\34\1\35\1\36\1\37\1\40"+
+            "\1\41\1\42\1\43\1\44\1\45\1\46\1\47\2\uffff\1\54\3\uffff\1\51"+
+            "\1\52\1\50\1\53",
+            "\1\55\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\56\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\57\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\60\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\61\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\62",
+            "\1\63\1\64",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\66\1\67",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\70",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\71\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\72\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\73\2\uffff\1\74\4\uffff\1\75\1\76\1\77\1\100\1\101\1\102"+
+            "\1\uffff\1\103\1\104\1\105\1\106\5\uffff\1\107\1\110\1\111\1"+
+            "\112\1\113\1\114\1\115\1\116\1\117\1\120\1\121\1\122\2\uffff"+
+            "\1\127\3\uffff\1\124\1\125\1\123\1\126",
             "",
-            "",
-            "",
-            "\1\11",
-            "\1\11",
-            "\1\12\1\uffff\1\13\34\uffff\11\13",
-            "",
-            ""
+            "\1\130\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\131\2\uffff\1\132\4\uffff\1\133\1\134\1\135\1\136\1\137"+
+            "\1\140\1\uffff\1\141\1\142\1\143\1\144\5\uffff\1\145\1\146\1"+
+            "\147\1\150\1\151\1\152\1\153\1\154\1\155\1\156\1\157\1\160\2"+
+            "\uffff\1\165\3\uffff\1\162\1\163\1\161\1\164",
+            "\1\17\1\uffff\1\166\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11"+
+            "\1\12\1\13",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\167",
+            "\1\uffff",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\170",
+            "\1\uffff",
+            "\1\171\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\172\34\uffff\1\14\1\10\1\4\1\5\1\6\1\7\1\11\1\12\1\13",
+            "\1\uffff",
+            "\1\uffff"
     };
 
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
+    static final short[] DFA13_eot = DFA.unpackEncodedString(DFA13_eotS);
+    static final short[] DFA13_eof = DFA.unpackEncodedString(DFA13_eofS);
+    static final char[] DFA13_min = DFA.unpackEncodedStringToUnsignedChars(DFA13_minS);
+    static final char[] DFA13_max = DFA.unpackEncodedStringToUnsignedChars(DFA13_maxS);
+    static final short[] DFA13_accept = DFA.unpackEncodedString(DFA13_acceptS);
+    static final short[] DFA13_special = DFA.unpackEncodedString(DFA13_specialS);
+    static final short[][] DFA13_transition;
 
     static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
+        int numStates = DFA13_transitionS.length;
+        DFA13_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
+            DFA13_transition[i] = DFA.unpackEncodedString(DFA13_transitionS[i]);
         }
     }
 
-    class DFA12 extends DFA {
+    class DFA13 extends DFA {
 
-        public DFA12(BaseRecognizer recognizer) {
+        public DFA13(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
+            this.decisionNumber = 13;
+            this.eot = DFA13_eot;
+            this.eof = DFA13_eof;
+            this.min = DFA13_min;
+            this.max = DFA13_max;
+            this.accept = DFA13_accept;
+            this.special = DFA13_special;
+            this.transition = DFA13_transition;
         }
         public String getDescription() {
-            return "208:1: functionArgument : ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName );";
+            return "349:1: valueFunction : (cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN ) | {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA12_0 = input.LA(1);
+                        int LA13_0 = input.LA(1);
 
                          
-                        int index12_0 = input.index();
+                        int index13_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA12_0==ID) ) {s = 1;}
+                        if ( (LA13_0==SCORE) ) {s = 1;}
 
-                        else if ( (LA12_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                        else if ( (LA12_0==QUOTED_STRING||(LA12_0>=FLOATING_POINT_LITERAL && LA12_0<=TIMESTAMP)) ) {s = 3;}
-
-                        else if ( (LA12_0==COLON) && ((strict == false))) {s = 4;}
+                        else if ( (LA13_0==SELECT||LA13_0==AS||(LA13_0>=FROM && LA13_0<=ON)||(LA13_0>=WHERE && LA13_0<=NOT)||(LA13_0>=IN && LA13_0<=DESC)||LA13_0==ID||(LA13_0>=TRUE && LA13_0<=TIMESTAMP)) && ((strict == false))) {s = 2;}
 
                          
-                        input.seek(index12_0);
+                        input.seek(index13_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA12_2 = input.LA(1);
+                        int LA13_122 = input.LA(1);
 
                          
-                        int index12_2 = input.index();
+                        int index13_122 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA12_2==SELECT||LA12_2==AS||(LA12_2>=FROM && LA12_2<=ON)||(LA12_2>=WHERE && LA12_2<=NOT)||(LA12_2>=IN && LA12_2<=DESC)||(LA12_2>=TRUE && LA12_2<=TIMESTAMP)) && ((strict == false))) {s = 7;}
+                        if ( (!(((strict == false)))) ) {s = 53;}
 
-                        else if ( (LA12_2==ID) && ((strict == false))) {s = 8;}
+                        else if ( ((strict == false)) ) {s = 2;}
 
                          
-                        input.seek(index12_2);
+                        input.seek(index13_122);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA12_9 = input.LA(1);
+                        int LA13_121 = input.LA(1);
 
                          
-                        int index12_9 = input.index();
+                        int index13_121 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA12_9==DOT) && ((strict == false))) {s = 10;}
+                        if ( (!(((strict == false)))) ) {s = 53;}
 
-                        else if ( (LA12_9==RPAREN||(LA12_9>=COLON && LA12_9<=TIMESTAMP)) && ((strict == false))) {s = 11;}
+                        else if ( ((strict == false)) ) {s = 2;}
 
                          
-                        input.seek(index12_9);
+                        input.seek(index13_121);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA12_7 = input.LA(1);
+                        int LA13_118 = input.LA(1);
 
                          
-                        int index12_7 = input.index();
+                        int index13_118 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA12_7==DOUBLE_QUOTE) && ((strict == false))) {s = 9;}
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
 
                          
-                        input.seek(index12_7);
+                        input.seek(index13_118);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA12_8 = input.LA(1);
+                        int LA13_48 = input.LA(1);
 
                          
-                        int index12_8 = input.index();
+                        int index13_48 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA12_8==DOUBLE_QUOTE) && ((strict == false))) {s = 9;}
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
 
                          
-                        input.seek(index12_8);
+                        input.seek(index13_48);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA13_47 = input.LA(1);
+
+                         
+                        int index13_47 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_47);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA13_46 = input.LA(1);
+
+                         
+                        int index13_46 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_46);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA13_45 = input.LA(1);
+
+                         
+                        int index13_45 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_45);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA13_13 = input.LA(1);
+
+                         
+                        int index13_13 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA13_14 = input.LA(1);
+
+                         
+                        int index13_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA13_49 = input.LA(1);
+
+                         
+                        int index13_49 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_49);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA13_57 = input.LA(1);
+
+                         
+                        int index13_57 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_57);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA13_58 = input.LA(1);
+
+                         
+                        int index13_58 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_58);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA13_88 = input.LA(1);
+
+                         
+                        int index13_88 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (!(((strict == false)))) ) {s = 53;}
+
+                        else if ( ((strict == false)) ) {s = 2;}
+
+                         
+                        input.seek(index13_88);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 12, _s, input);
+                new NoViableAltException(getDescription(), 13, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA24_eotS =
-        "\41\uffff";
-    static final String DFA24_eofS =
-        "\41\uffff";
-    static final String DFA24_minS =
-        "\2\37\5\uffff\1\37\1\uffff\1\44\1\37\1\45\3\46\2\45\2\105\2\106"+
-        "\2\46\1\37\1\46\1\37\1\44\4\106\2\46";
-    static final String DFA24_maxS =
-        "\2\113\5\uffff\1\113\1\uffff\7\113\1\104\4\106\6\113\4\106\2\113";
-    static final String DFA24_acceptS =
-        "\2\uffff\5\2\1\uffff\1\1\30\uffff";
-    static final String DFA24_specialS =
-        "\1\0\40\uffff}>";
-    static final String[] DFA24_transitionS = {
-            "\1\6\2\uffff\1\6\2\uffff\1\6\1\uffff\6\6\1\uffff\3\6\1\1\5"+
-            "\uffff\4\6\1\4\7\6\1\5\1\4\1\2\1\3\5\4",
-            "\1\10\2\uffff\1\10\2\uffff\1\7\1\uffff\6\10\1\uffff\4\10\5"+
-            "\uffff\25\10",
+    static final String DFA14_eotS =
+        "\47\uffff";
+    static final String DFA14_eofS =
+        "\47\uffff";
+    static final String DFA14_minS =
+        "\1\103\1\44\1\37\4\uffff\35\106\1\44\2\uffff";
+    static final String DFA14_maxS =
+        "\2\113\1\114\4\uffff\35\106\1\113\2\uffff";
+    static final String DFA14_acceptS =
+        "\3\uffff\2\3\1\2\1\1\36\uffff\1\1\1\2";
+    static final String DFA14_specialS =
+        "\1\26\1\uffff\1\25\4\uffff\1\27\1\20\1\13\1\10\1\12\1\5\1\0\1\34"+
+        "\1\33\1\36\1\17\1\31\1\24\1\7\1\15\1\3\1\2\1\4\1\32\1\35\1\37\1"+
+        "\21\1\23\1\6\1\11\1\14\1\1\1\22\1\16\1\30\2\uffff}>";
+    static final String[] DFA14_transitionS = {
+            "\1\4\1\3\1\1\1\2\5\3",
+            "\1\6\1\uffff\1\5\34\uffff\11\5",
+            "\1\7\2\uffff\1\10\4\uffff\1\11\1\12\1\13\1\14\1\15\1\16\1"+
+            "\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23\1\24\1\25\1\26\1\27"+
+            "\1\30\1\31\1\32\1\33\1\34\1\35\1\36\2\uffff\1\43\3\uffff\1\40"+
+            "\1\41\1\37\1\42",
             "",
             "",
             "",
             "",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\44",
+            "\1\45\1\uffff\1\46\34\uffff\11\46",
             "",
-            "\1\10\2\uffff\1\10\2\uffff\1\10\1\6\6\10\1\uffff\4\10\5\uffff"+
-            "\14\10\1\21\1\16\1\11\1\12\1\14\1\15\1\13\1\17\1\20",
-            "",
-            "\1\22\1\10\1\6\6\uffff\1\10\3\uffff\11\10\11\uffff\11\6",
-            "\1\23\2\uffff\1\23\4\uffff\6\23\1\uffff\4\23\5\uffff\14\23"+
-            "\2\uffff\1\24\3\uffff\3\23",
-            "\1\10\1\6\6\uffff\1\10\4\uffff\5\10\14\uffff\11\6",
-            "\1\6\6\uffff\1\10\4\uffff\5\10\14\uffff\11\6",
-            "\1\6\6\uffff\1\10\4\uffff\5\10\14\uffff\11\6",
-            "\1\6\6\uffff\1\10\4\uffff\5\10\14\uffff\11\6",
-            "\1\10\1\6\6\uffff\1\10\4\uffff\5\10\14\uffff\11\6",
-            "\1\10\36\uffff\1\25",
-            "\1\26\1\27",
-            "\1\30\1\31",
-            "\1\32",
-            "\1\32",
-            "\1\6\6\uffff\1\10\4\uffff\5\10\14\uffff\11\6",
-            "\1\6\6\uffff\1\10\4\uffff\5\10\14\uffff\11\6",
-            "\1\33\2\uffff\1\33\4\uffff\6\33\1\uffff\4\33\5\uffff\14\33"+
-            "\2\uffff\1\34\3\uffff\3\33",
-            "\1\6\6\uffff\1\10\3\uffff\11\10\11\uffff\11\6",
-            "\1\35\2\uffff\1\35\4\uffff\6\35\1\uffff\4\35\5\uffff\14\35"+
-            "\2\uffff\1\36\3\uffff\3\35",
-            "\1\22\1\uffff\1\6\6\uffff\1\10\3\uffff\11\10\11\uffff\11\6",
-            "\1\37",
-            "\1\37",
-            "\1\40",
-            "\1\40",
-            "\1\6\6\uffff\1\10\4\uffff\5\10\14\uffff\11\6",
-            "\1\6\6\uffff\1\10\3\uffff\11\10\11\uffff\11\6"
+            ""
     };
 
-    static final short[] DFA24_eot = DFA.unpackEncodedString(DFA24_eotS);
-    static final short[] DFA24_eof = DFA.unpackEncodedString(DFA24_eofS);
-    static final char[] DFA24_min = DFA.unpackEncodedStringToUnsignedChars(DFA24_minS);
-    static final char[] DFA24_max = DFA.unpackEncodedStringToUnsignedChars(DFA24_maxS);
-    static final short[] DFA24_accept = DFA.unpackEncodedString(DFA24_acceptS);
-    static final short[] DFA24_special = DFA.unpackEncodedString(DFA24_specialS);
-    static final short[][] DFA24_transition;
+    static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
+    static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
+    static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
+    static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
+    static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
+    static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
+    static final short[][] DFA14_transition;
 
     static {
-        int numStates = DFA24_transitionS.length;
-        DFA24_transition = new short[numStates][];
+        int numStates = DFA14_transitionS.length;
+        DFA14_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA24_transition[i] = DFA.unpackEncodedString(DFA24_transitionS[i]);
+            DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
         }
     }
 
-    class DFA24 extends DFA {
+    class DFA14 extends DFA {
 
-        public DFA24(BaseRecognizer recognizer) {
+        public DFA14(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 24;
-            this.eot = DFA24_eot;
-            this.eof = DFA24_eof;
-            this.min = DFA24_min;
-            this.max = DFA24_max;
-            this.accept = DFA24_accept;
-            this.special = DFA24_special;
-            this.transition = DFA24_transition;
+            this.decisionNumber = 14;
+            this.eot = DFA14_eot;
+            this.eof = DFA14_eof;
+            this.min = DFA14_min;
+            this.max = DFA14_max;
+            this.accept = DFA14_accept;
+            this.special = DFA14_special;
+            this.transition = DFA14_transition;
         }
         public String getDescription() {
-            return "295:1: searchNotCondition : ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest );";
+            return "358:1: functionArgument : ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA24_0 = input.LA(1);
+                        int LA14_13 = input.LA(1);
 
                          
-                        int index24_0 = input.index();
+                        int index14_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA24_0==NOT) ) {s = 1;}
-
-                        else if ( (LA24_0==ID) ) {s = 2;}
-
-                        else if ( (LA24_0==DOUBLE_QUOTE) && ((strict == false))) {s = 3;}
-
-                        else if ( (LA24_0==ANY||LA24_0==QUOTED_STRING||(LA24_0>=FLOATING_POINT_LITERAL && LA24_0<=TIMESTAMP)) ) {s = 4;}
-
-                        else if ( (LA24_0==COLON) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA24_0==SELECT||LA24_0==AS||LA24_0==LPAREN||(LA24_0>=FROM && LA24_0<=ON)||(LA24_0>=WHERE && LA24_0<=AND)||(LA24_0>=IN && LA24_0<=NULL)||(LA24_0>=CONTAINS && LA24_0<=DESC)) ) {s = 6;}
+                        if ( (LA14_13==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
 
                          
-                        input.seek(index24_0);
+                        input.seek(index14_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA14_33 = input.LA(1);
+
+                         
+                        int index14_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_33==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA14_23 = input.LA(1);
+
+                         
+                        int index14_23 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_23==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_23);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA14_22 = input.LA(1);
+
+                         
+                        int index14_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_22==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA14_24 = input.LA(1);
+
+                         
+                        int index14_24 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_24==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_24);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA14_12 = input.LA(1);
+
+                         
+                        int index14_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_12==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA14_30 = input.LA(1);
+
+                         
+                        int index14_30 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_30==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_30);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA14_20 = input.LA(1);
+
+                         
+                        int index14_20 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_20==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_20);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA14_10 = input.LA(1);
+
+                         
+                        int index14_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_10==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA14_31 = input.LA(1);
+
+                         
+                        int index14_31 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_31==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_31);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA14_11 = input.LA(1);
+
+                         
+                        int index14_11 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_11==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_11);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA14_9 = input.LA(1);
+
+                         
+                        int index14_9 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_9==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_9);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA14_32 = input.LA(1);
+
+                         
+                        int index14_32 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_32==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_32);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA14_21 = input.LA(1);
+
+                         
+                        int index14_21 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_21==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_21);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA14_35 = input.LA(1);
+
+                         
+                        int index14_35 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_35==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_35);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA14_17 = input.LA(1);
+
+                         
+                        int index14_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_17==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA14_8 = input.LA(1);
+
+                         
+                        int index14_8 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_8==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_8);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA14_28 = input.LA(1);
+
+                         
+                        int index14_28 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_28==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_28);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
+                        int LA14_34 = input.LA(1);
+
+                         
+                        int index14_34 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_34==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_34);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 19 : 
+                        int LA14_29 = input.LA(1);
+
+                         
+                        int index14_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_29==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA14_19 = input.LA(1);
+
+                         
+                        int index14_19 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_19==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_19);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA14_2 = input.LA(1);
+
+                         
+                        int index14_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_2==SELECT) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA14_2==AS) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA14_2==FROM) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA14_2==JOIN) && ((strict == false))) {s = 10;}
+
+                        else if ( (LA14_2==INNER) && ((strict == false))) {s = 11;}
+
+                        else if ( (LA14_2==LEFT) && ((strict == false))) {s = 12;}
+
+                        else if ( (LA14_2==OUTER) && ((strict == false))) {s = 13;}
+
+                        else if ( (LA14_2==ON) && ((strict == false))) {s = 14;}
+
+                        else if ( (LA14_2==WHERE) && ((strict == false))) {s = 15;}
+
+                        else if ( (LA14_2==OR) && ((strict == false))) {s = 16;}
+
+                        else if ( (LA14_2==AND) && ((strict == false))) {s = 17;}
+
+                        else if ( (LA14_2==NOT) && ((strict == false))) {s = 18;}
+
+                        else if ( (LA14_2==IN) && ((strict == false))) {s = 19;}
+
+                        else if ( (LA14_2==LIKE) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA14_2==IS) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA14_2==NULL) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA14_2==ANY) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA14_2==CONTAINS) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA14_2==IN_FOLDER) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA14_2==IN_TREE) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA14_2==ORDER) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA14_2==BY) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA14_2==ASC) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA14_2==DESC) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA14_2==TIMESTAMP) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA14_2==TRUE) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA14_2==FALSE) && ((strict == false))) {s = 33;}
+
+                        else if ( (LA14_2==SCORE) && ((strict == false))) {s = 34;}
+
+                        else if ( (LA14_2==ID) && ((strict == false))) {s = 35;}
+
+                         
+                        input.seek(index14_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA14_0 = input.LA(1);
+
+                         
+                        int index14_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_0==ID) ) {s = 1;}
+
+                        else if ( (LA14_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
+
+                        else if ( (LA14_0==QUOTED_STRING||(LA14_0>=FLOATING_POINT_LITERAL && LA14_0<=TIMESTAMP)) ) {s = 3;}
+
+                        else if ( (LA14_0==COLON) && ((strict == false))) {s = 4;}
+
+                         
+                        input.seek(index14_0);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA14_7 = input.LA(1);
+
+                         
+                        int index14_7 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_7==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_7);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA14_36 = input.LA(1);
+
+                         
+                        int index14_36 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_36==DOT) && ((strict == false))) {s = 37;}
+
+                        else if ( (LA14_36==RPAREN||(LA14_36>=COLON && LA14_36<=TIMESTAMP)) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index14_36);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA14_18 = input.LA(1);
+
+                         
+                        int index14_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_18==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA14_25 = input.LA(1);
+
+                         
+                        int index14_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_25==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_25);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA14_15 = input.LA(1);
+
+                         
+                        int index14_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_15==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_15);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA14_14 = input.LA(1);
+
+                         
+                        int index14_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_14==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA14_26 = input.LA(1);
+
+                         
+                        int index14_26 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_26==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_26);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA14_16 = input.LA(1);
+
+                         
+                        int index14_16 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_16==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_16);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA14_27 = input.LA(1);
+
+                         
+                        int index14_27 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA14_27==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index14_27);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 24, _s, input);
+                new NoViableAltException(getDescription(), 14, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String DFA15_eotS =
+        "\43\uffff";
+    static final String DFA15_eofS =
+        "\43\uffff";
+    static final String DFA15_minS =
+        "\1\105\1\0\1\37\2\uffff\35\106\1\0";
+    static final String DFA15_maxS =
+        "\1\106\1\0\1\114\2\uffff\35\106\1\0";
+    static final String DFA15_acceptS =
+        "\3\uffff\1\1\1\2\36\uffff";
+    static final String DFA15_specialS =
+        "\1\36\1\16\1\5\2\uffff\1\32\1\34\1\37\1\17\1\21\1\23\1\25\1\10"+
+        "\1\6\1\3\1\1\1\15\1\14\1\13\1\12\1\27\1\24\1\22\1\20\1\40\1\35\1"+
+        "\33\1\31\1\4\1\7\1\0\1\2\1\30\1\11\1\26}>";
+    static final String[] DFA15_transitionS = {
+            "\1\1\1\2",
+            "\1\uffff",
+            "\1\5\2\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\uffff"+
+            "\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1"+
+            "\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\41\3\uffff\1\36\1\37"+
+            "\1\35\1\40",
+            "",
+            "",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\42",
+            "\1\uffff"
+    };
+
+    static final short[] DFA15_eot = DFA.unpackEncodedString(DFA15_eotS);
+    static final short[] DFA15_eof = DFA.unpackEncodedString(DFA15_eofS);
+    static final char[] DFA15_min = DFA.unpackEncodedStringToUnsignedChars(DFA15_minS);
+    static final char[] DFA15_max = DFA.unpackEncodedStringToUnsignedChars(DFA15_maxS);
+    static final short[] DFA15_accept = DFA.unpackEncodedString(DFA15_acceptS);
+    static final short[] DFA15_special = DFA.unpackEncodedString(DFA15_specialS);
+    static final short[][] DFA15_transition;
+
+    static {
+        int numStates = DFA15_transitionS.length;
+        DFA15_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA15_transition[i] = DFA.unpackEncodedString(DFA15_transitionS[i]);
+        }
+    }
+
+    class DFA15 extends DFA {
+
+        public DFA15(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 15;
+            this.eot = DFA15_eot;
+            this.eof = DFA15_eof;
+            this.min = DFA15_min;
+            this.max = DFA15_max;
+            this.accept = DFA15_accept;
+            this.special = DFA15_special;
+            this.transition = DFA15_transition;
+        }
+        public String getDescription() {
+            return "365:1: qualifier : ( ( tableName )=> tableName -> tableName | correlationName -> correlationName );";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA15_30 = input.LA(1);
+
+                         
+                        int index15_30 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_30==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_30);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA15_15 = input.LA(1);
+
+                         
+                        int index15_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_15==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_15);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA15_31 = input.LA(1);
+
+                         
+                        int index15_31 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_31==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_31);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA15_14 = input.LA(1);
+
+                         
+                        int index15_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_14==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA15_28 = input.LA(1);
+
+                         
+                        int index15_28 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_28==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_28);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA15_2 = input.LA(1);
+
+                         
+                        int index15_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_2==SELECT) && ((strict == false))) {s = 5;}
+
+                        else if ( (LA15_2==AS) && ((strict == false))) {s = 6;}
+
+                        else if ( (LA15_2==FROM) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA15_2==JOIN) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA15_2==INNER) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA15_2==LEFT) && ((strict == false))) {s = 10;}
+
+                        else if ( (LA15_2==OUTER) && ((strict == false))) {s = 11;}
+
+                        else if ( (LA15_2==ON) && ((strict == false))) {s = 12;}
+
+                        else if ( (LA15_2==WHERE) && ((strict == false))) {s = 13;}
+
+                        else if ( (LA15_2==OR) && ((strict == false))) {s = 14;}
+
+                        else if ( (LA15_2==AND) && ((strict == false))) {s = 15;}
+
+                        else if ( (LA15_2==NOT) && ((strict == false))) {s = 16;}
+
+                        else if ( (LA15_2==IN) && ((strict == false))) {s = 17;}
+
+                        else if ( (LA15_2==LIKE) && ((strict == false))) {s = 18;}
+
+                        else if ( (LA15_2==IS) && ((strict == false))) {s = 19;}
+
+                        else if ( (LA15_2==NULL) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA15_2==ANY) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA15_2==CONTAINS) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA15_2==IN_FOLDER) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA15_2==IN_TREE) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA15_2==ORDER) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA15_2==BY) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA15_2==ASC) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA15_2==DESC) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA15_2==TIMESTAMP) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA15_2==TRUE) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA15_2==FALSE) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA15_2==SCORE) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA15_2==ID) && ((strict == false))) {s = 33;}
+
+                         
+                        input.seek(index15_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA15_13 = input.LA(1);
+
+                         
+                        int index15_13 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_13==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA15_29 = input.LA(1);
+
+                         
+                        int index15_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_29==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA15_12 = input.LA(1);
+
+                         
+                        int index15_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_12==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA15_33 = input.LA(1);
+
+                         
+                        int index15_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_33==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA15_19 = input.LA(1);
+
+                         
+                        int index15_19 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_19==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_19);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA15_18 = input.LA(1);
+
+                         
+                        int index15_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_18==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA15_17 = input.LA(1);
+
+                         
+                        int index15_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_17==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA15_16 = input.LA(1);
+
+                         
+                        int index15_16 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_16==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_16);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA15_1 = input.LA(1);
+
+                         
+                        int index15_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred2_CMIS()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 4;}
+
+                         
+                        input.seek(index15_1);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA15_8 = input.LA(1);
+
+                         
+                        int index15_8 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_8==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_8);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA15_23 = input.LA(1);
+
+                         
+                        int index15_23 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_23==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_23);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA15_9 = input.LA(1);
+
+                         
+                        int index15_9 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_9==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_9);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
+                        int LA15_22 = input.LA(1);
+
+                         
+                        int index15_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_22==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 19 : 
+                        int LA15_10 = input.LA(1);
+
+                         
+                        int index15_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_10==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA15_21 = input.LA(1);
+
+                         
+                        int index15_21 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_21==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_21);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA15_11 = input.LA(1);
+
+                         
+                        int index15_11 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_11==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_11);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA15_34 = input.LA(1);
+
+                         
+                        int index15_34 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( ((synpred2_CMIS()&&(strict == false))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index15_34);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA15_20 = input.LA(1);
+
+                         
+                        int index15_20 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_20==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_20);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA15_32 = input.LA(1);
+
+                         
+                        int index15_32 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_32==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_32);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA15_27 = input.LA(1);
+
+                         
+                        int index15_27 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_27==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_27);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA15_5 = input.LA(1);
+
+                         
+                        int index15_5 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_5==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_5);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA15_26 = input.LA(1);
+
+                         
+                        int index15_26 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_26==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_26);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA15_6 = input.LA(1);
+
+                         
+                        int index15_6 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_6==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_6);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA15_25 = input.LA(1);
+
+                         
+                        int index15_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_25==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_25);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA15_0 = input.LA(1);
+
+                         
+                        int index15_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_0==ID) ) {s = 1;}
+
+                        else if ( (LA15_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
+
+                         
+                        input.seek(index15_0);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA15_7 = input.LA(1);
+
+                         
+                        int index15_7 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_7==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_7);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 32 : 
+                        int LA15_24 = input.LA(1);
+
+                         
+                        int index15_24 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA15_24==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index15_24);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 15, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String DFA26_eotS =
-        "\102\uffff";
+        "\167\uffff";
     static final String DFA26_eofS =
-        "\61\uffff\1\56\3\uffff\1\62\2\uffff\1\62\11\uffff";
+        "\167\uffff";
     static final String DFA26_minS =
-        "\1\37\1\44\1\37\1\45\1\uffff\3\45\1\uffff\3\45\1\uffff\1\67\1\uffff"+
-        "\1\105\2\uffff\2\106\2\uffff\3\46\1\55\1\37\1\44\1\41\1\37\1\46"+
-        "\1\41\1\37\1\46\1\41\1\37\1\46\2\106\1\uffff\1\105\1\67\5\uffff"+
-        "\2\106\1\46\1\uffff\2\106\1\46\2\106\1\46\2\55\1\37\3\41\2\106\1"+
-        "\55";
+        "\2\37\12\uffff\1\37\1\44\1\37\3\45\3\46\1\105\1\uffff\1\105\35"+
+        "\106\2\46\1\37\1\46\1\37\1\44\72\106\2\46";
     static final String DFA26_maxS =
-        "\1\113\1\71\1\113\1\66\1\uffff\1\66\1\104\1\106\1\uffff\3\45\1"+
-        "\uffff\1\70\1\uffff\1\106\2\uffff\2\106\2\uffff\3\113\1\71\1\113"+
-        "\1\71\11\113\2\106\1\uffff\1\106\1\70\5\uffff\2\106\1\77\1\uffff"+
-        "\2\106\1\77\2\106\1\77\2\71\4\113\2\106\1\71";
+        "\2\114\12\uffff\1\114\1\113\1\114\1\104\5\113\1\106\1\uffff\36"+
+        "\106\2\113\1\114\1\113\1\114\1\113\72\106\2\113";
     static final String DFA26_acceptS =
-        "\4\uffff\1\5\3\uffff\1\5\3\uffff\1\1\1\uffff\1\2\1\uffff\1\4\1"+
-        "\3\2\uffff\1\5\1\6\21\uffff\1\4\2\uffff\1\2\1\3\2\1\1\7\3\uffff"+
-        "\1\10\17\uffff";
+        "\2\uffff\11\2\1\1\12\uffff\1\2\140\uffff";
     static final String DFA26_specialS =
-        "\1\3\1\uffff\1\4\17\uffff\1\2\1\7\7\uffff\1\11\14\uffff\1\1\1\10"+
-        "\20\uffff\1\6\1\0\3\uffff\1\5\1\13\1\12}>";
+        "\1\15\13\uffff\1\7\1\5\2\uffff\1\3\1\4\1\6\1\0\1\1\40\uffff\1\2"+
+        "\1\11\1\uffff\1\10\1\uffff\1\14\72\uffff\1\12\1\13}>";
     static final String[] DFA26_transitionS = {
-            "\1\14\2\uffff\1\14\4\uffff\6\14\1\uffff\4\14\5\uffff\4\14\1"+
-            "\7\1\11\1\12\1\13\4\14\1\10\1\4\1\1\1\2\2\4\1\3\1\5\1\6",
-            "\1\17\1\14\7\uffff\1\14\3\uffff\1\15\5\14\1\16\1\21\1\20",
-            "\1\22\2\uffff\1\22\4\uffff\6\22\1\uffff\4\22\5\uffff\14\22"+
-            "\2\uffff\1\23\3\uffff\3\22",
-            "\1\14\7\uffff\1\24\4\uffff\5\24",
-            "",
-            "\1\14\7\uffff\1\24\4\uffff\5\24",
-            "\1\14\36\uffff\1\24",
-            "\1\14\37\uffff\2\25",
-            "",
-            "\1\26",
-            "\1\27",
-            "\1\30",
-            "",
-            "\1\16\1\21",
-            "",
-            "\1\31\1\32",
-            "",
-            "",
-            "\1\33",
-            "\1\33",
-            "",
-            "",
-            "\1\14\34\uffff\1\14\1\36\1\34\1\35\5\14",
-            "\1\14\34\uffff\1\14\1\41\1\37\1\40\5\14",
-            "\1\14\34\uffff\1\14\1\44\1\42\1\43\5\14",
-            "\1\14\3\uffff\1\15\5\14\1\16\1\21\1\20",
-            "\1\45\2\uffff\1\45\4\uffff\6\45\1\uffff\4\45\5\uffff\14\45"+
-            "\2\uffff\1\46\3\uffff\3\45",
-            "\1\50\10\uffff\1\54\3\uffff\1\51\5\54\1\52\1\53\1\47",
-            "\1\56\2\uffff\1\55\1\uffff\1\55\34\uffff\11\55",
-            "\1\57\2\uffff\1\57\4\uffff\6\57\1\uffff\4\57\5\uffff\14\57"+
-            "\2\uffff\1\60\3\uffff\3\57",
-            "\1\61\34\uffff\11\55",
-            "\1\62\2\uffff\1\55\1\uffff\1\55\34\uffff\11\55",
-            "\1\63\2\uffff\1\63\4\uffff\6\63\1\uffff\4\63\5\uffff\14\63"+
-            "\2\uffff\1\64\3\uffff\3\63",
-            "\1\65\34\uffff\11\55",
-            "\1\62\2\uffff\1\55\1\uffff\1\55\34\uffff\11\55",
-            "\1\66\2\uffff\1\66\4\uffff\6\66\1\uffff\4\66\5\uffff\14\66"+
-            "\2\uffff\1\67\3\uffff\3\66",
-            "\1\70\34\uffff\11\55",
-            "\1\71",
-            "\1\71",
-            "",
-            "\1\72\1\73",
-            "\1\52\1\53",
+            "\1\5\2\uffff\1\5\2\uffff\1\12\1\uffff\6\5\1\uffff\3\5\1\1\5"+
+            "\uffff\4\5\4\6\4\7\1\11\1\10\1\2\1\3\5\10\1\4",
+            "\1\13\2\uffff\1\13\2\uffff\1\14\1\uffff\6\13\1\uffff\4\13"+
+            "\5\uffff\26\13",
             "",
             "",
             "",
             "",
             "",
-            "\1\74",
-            "\1\74",
-            "\1\56\6\uffff\1\55\1\uffff\2\56\1\uffff\5\55\10\uffff\1\56",
             "",
-            "\1\75",
-            "\1\75",
-            "\1\62\6\uffff\1\55\1\uffff\2\62\1\uffff\5\55\10\uffff\1\62",
-            "\1\76",
-            "\1\76",
-            "\1\62\6\uffff\1\55\1\uffff\2\62\1\uffff\5\55\10\uffff\1\62",
-            "\1\55\3\uffff\1\15\5\55\1\16\1\21\1\20",
-            "\1\54\3\uffff\1\51\5\54\1\52\1\53\1\47",
-            "\1\77\2\uffff\1\77\4\uffff\6\77\1\uffff\4\77\5\uffff\14\77"+
-            "\2\uffff\1\100\3\uffff\3\77",
-            "\1\56\2\uffff\1\55\1\uffff\1\55\34\uffff\11\55",
-            "\1\62\2\uffff\1\55\1\uffff\1\55\34\uffff\11\55",
-            "\1\62\2\uffff\1\55\1\uffff\1\55\34\uffff\11\55",
-            "\1\101",
-            "\1\101",
-            "\1\54\3\uffff\1\51\5\54\1\52\1\53\1\47"
+            "",
+            "",
+            "",
+            "",
+            "\1\13\2\uffff\1\13\2\uffff\1\13\1\26\6\13\1\uffff\4\13\5\uffff"+
+            "\14\13\1\25\1\24\1\15\1\16\1\22\1\23\1\20\1\21\1\17\1\13",
+            "\1\27\1\13\1\26\6\uffff\1\13\3\uffff\11\13\11\uffff\11\26",
+            "\1\30\2\uffff\1\31\4\uffff\1\32\1\33\1\34\1\35\1\36\1\37\1"+
+            "\uffff\1\40\1\41\1\42\1\43\5\uffff\1\44\1\45\1\46\1\47\1\50"+
+            "\1\51\1\52\1\53\1\54\1\55\1\56\1\57\2\uffff\1\64\3\uffff\1\61"+
+            "\1\62\1\60\1\63",
+            "\1\13\36\uffff\1\65",
+            "\1\13\1\26\6\uffff\1\13\4\uffff\5\13\14\uffff\11\26",
+            "\1\13\1\26\6\uffff\1\13\4\uffff\5\13\14\uffff\11\26",
+            "\1\26\6\uffff\1\13\4\uffff\5\13\14\uffff\11\26",
+            "\1\26\6\uffff\1\13\4\uffff\5\13\14\uffff\11\26",
+            "\1\26\6\uffff\1\13\4\uffff\5\13\14\uffff\11\26",
+            "\1\66\1\67",
+            "",
+            "\1\70\1\71",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\72",
+            "\1\26\6\uffff\1\13\4\uffff\5\13\14\uffff\11\26",
+            "\1\26\6\uffff\1\13\4\uffff\5\13\14\uffff\11\26",
+            "\1\73\2\uffff\1\74\4\uffff\1\75\1\76\1\77\1\100\1\101\1\102"+
+            "\1\uffff\1\103\1\104\1\105\1\106\5\uffff\1\107\1\110\1\111\1"+
+            "\112\1\113\1\114\1\115\1\116\1\117\1\120\1\121\1\122\2\uffff"+
+            "\1\127\3\uffff\1\124\1\125\1\123\1\126",
+            "\1\26\6\uffff\1\13\3\uffff\11\13\11\uffff\11\26",
+            "\1\130\2\uffff\1\131\4\uffff\1\132\1\133\1\134\1\135\1\136"+
+            "\1\137\1\uffff\1\140\1\141\1\142\1\143\5\uffff\1\144\1\145\1"+
+            "\146\1\147\1\150\1\151\1\152\1\153\1\154\1\155\1\156\1\157\2"+
+            "\uffff\1\164\3\uffff\1\161\1\162\1\160\1\163",
+            "\1\27\1\uffff\1\26\6\uffff\1\13\3\uffff\11\13\11\uffff\11"+
+            "\26",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\165",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\166",
+            "\1\26\6\uffff\1\13\4\uffff\5\13\14\uffff\11\26",
+            "\1\26\6\uffff\1\13\3\uffff\11\13\11\uffff\11\26"
     };
 
     static final short[] DFA26_eot = DFA.unpackEncodedString(DFA26_eotS);
@@ -7677,222 +11446,258 @@ public class CMISParser extends Parser {
             this.transition = DFA26_transition;
         }
         public String getDescription() {
-            return "309:1: predicate : ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate );";
+            return "449:1: searchNotCondition : ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA26_59 = input.LA(1);
-
-                         
-                        int index26_59 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_59==SELECT||LA26_59==AS||(LA26_59>=FROM && LA26_59<=ON)||(LA26_59>=WHERE && LA26_59<=NOT)||(LA26_59>=IN && LA26_59<=DESC)||(LA26_59>=TRUE && LA26_59<=TIMESTAMP)) && ((strict == false))) {s = 63;}
-
-                        else if ( (LA26_59==ID) && ((strict == false))) {s = 64;}
-
-                         
-                        input.seek(index26_59);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA26_40 = input.LA(1);
-
-                         
-                        int index26_40 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_40==ID) && ((strict == false))) {s = 58;}
-
-                        else if ( (LA26_40==DOUBLE_QUOTE) && ((strict == false))) {s = 59;}
-
-                         
-                        input.seek(index26_40);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA26_18 = input.LA(1);
-
-                         
-                        int index26_18 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_18==DOUBLE_QUOTE) && ((strict == false))) {s = 27;}
-
-                         
-                        input.seek(index26_18);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA26_0 = input.LA(1);
-
-                         
-                        int index26_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_0==ID) ) {s = 1;}
-
-                        else if ( (LA26_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                        else if ( (LA26_0==TRUE) ) {s = 3;}
-
-                        else if ( (LA26_0==QUOTED_STRING||(LA26_0>=FLOATING_POINT_LITERAL && LA26_0<=DECIMAL_INTEGER_LITERAL)) ) {s = 4;}
-
-                        else if ( (LA26_0==FALSE) ) {s = 5;}
-
-                        else if ( (LA26_0==TIMESTAMP) ) {s = 6;}
-
-                        else if ( (LA26_0==ANY) ) {s = 7;}
-
-                        else if ( (LA26_0==COLON) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA26_0==CONTAINS) ) {s = 9;}
-
-                        else if ( (LA26_0==IN_FOLDER) ) {s = 10;}
-
-                        else if ( (LA26_0==IN_TREE) ) {s = 11;}
-
-                        else if ( (LA26_0==SELECT||LA26_0==AS||(LA26_0>=FROM && LA26_0<=ON)||(LA26_0>=WHERE && LA26_0<=NOT)||(LA26_0>=IN && LA26_0<=NULL)||(LA26_0>=ORDER && LA26_0<=DESC)) ) {s = 12;}
-
-                         
-                        input.seek(index26_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA26_2 = input.LA(1);
-
-                         
-                        int index26_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_2==SELECT||LA26_2==AS||(LA26_2>=FROM && LA26_2<=ON)||(LA26_2>=WHERE && LA26_2<=NOT)||(LA26_2>=IN && LA26_2<=DESC)||(LA26_2>=TRUE && LA26_2<=TIMESTAMP)) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA26_2==ID) && ((strict == false))) {s = 19;}
-
-                         
-                        input.seek(index26_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA26_63 = input.LA(1);
-
-                         
-                        int index26_63 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_63==DOUBLE_QUOTE) && ((strict == false))) {s = 65;}
-
-                         
-                        input.seek(index26_63);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA26_58 = input.LA(1);
-
-                         
-                        int index26_58 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_58==NOT) && ((strict == false))) {s = 41;}
-
-                        else if ( (LA26_58==IN) && ((strict == false))) {s = 42;}
-
-                        else if ( (LA26_58==IS) && ((strict == false))) {s = 39;}
-
-                        else if ( (LA26_58==LIKE) && ((strict == false))) {s = 43;}
-
-                        else if ( (LA26_58==EQUALS||(LA26_58>=NOTEQUALS && LA26_58<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 44;}
-
-                         
-                        input.seek(index26_58);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
                         int LA26_19 = input.LA(1);
 
                          
                         int index26_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA26_19==DOUBLE_QUOTE) && ((strict == false))) {s = 27;}
+                        if ( (LA26_19==RPAREN||(LA26_19>=COLON && LA26_19<=TIMESTAMP)) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA26_19==EQUALS||(LA26_19>=NOTEQUALS && LA26_19<=GREATERTHANOREQUALS)) ) {s = 11;}
 
                          
                         input.seek(index26_19);
                         if ( s>=0 ) return s;
                         break;
-                    case 8 : 
-                        int LA26_41 = input.LA(1);
+                    case 1 : 
+                        int LA26_20 = input.LA(1);
 
                          
-                        int index26_41 = input.index();
+                        int index26_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA26_41==IN) && ((strict == false))) {s = 42;}
+                        if ( (LA26_20==RPAREN||(LA26_20>=COLON && LA26_20<=TIMESTAMP)) && ((strict == false))) {s = 22;}
 
-                        else if ( (LA26_41==LIKE) && ((strict == false))) {s = 43;}
+                        else if ( (LA26_20==EQUALS||(LA26_20>=NOTEQUALS && LA26_20<=GREATERTHANOREQUALS)) ) {s = 11;}
 
                          
-                        input.seek(index26_41);
+                        input.seek(index26_20);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA26_53 = input.LA(1);
+
+                         
+                        int index26_53 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_53==RPAREN||(LA26_53>=COLON && LA26_53<=TIMESTAMP)) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA26_53==EQUALS||(LA26_53>=NOTEQUALS && LA26_53<=GREATERTHANOREQUALS)) ) {s = 11;}
+
+                         
+                        input.seek(index26_53);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA26_16 = input.LA(1);
+
+                         
+                        int index26_16 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_16==RPAREN||(LA26_16>=COLON && LA26_16<=TIMESTAMP)) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA26_16==LPAREN||LA26_16==EQUALS||(LA26_16>=NOTEQUALS && LA26_16<=GREATERTHANOREQUALS)) ) {s = 11;}
+
+                         
+                        input.seek(index26_16);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA26_17 = input.LA(1);
+
+                         
+                        int index26_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_17==LPAREN||LA26_17==EQUALS||(LA26_17>=NOTEQUALS && LA26_17<=GREATERTHANOREQUALS)) ) {s = 11;}
+
+                        else if ( (LA26_17==RPAREN||(LA26_17>=COLON && LA26_17<=TIMESTAMP)) && ((strict == false))) {s = 22;}
+
+                         
+                        input.seek(index26_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA26_13 = input.LA(1);
+
+                         
+                        int index26_13 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_13==LPAREN||LA26_13==EQUALS||(LA26_13>=NOT && LA26_13<=IS)) ) {s = 11;}
+
+                        else if ( (LA26_13==RPAREN||(LA26_13>=COLON && LA26_13<=TIMESTAMP)) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA26_13==DOT) ) {s = 23;}
+
+                         
+                        input.seek(index26_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA26_18 = input.LA(1);
+
+                         
+                        int index26_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_18==EQUALS||(LA26_18>=NOTEQUALS && LA26_18<=GREATERTHANOREQUALS)) ) {s = 11;}
+
+                        else if ( (LA26_18==RPAREN||(LA26_18>=COLON && LA26_18<=TIMESTAMP)) && ((strict == false))) {s = 22;}
+
+                         
+                        input.seek(index26_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA26_12 = input.LA(1);
+
+                         
+                        int index26_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_12==SELECT||LA26_12==AS||LA26_12==LPAREN||(LA26_12>=FROM && LA26_12<=ON)||(LA26_12>=WHERE && LA26_12<=NOT)||(LA26_12>=IN && LA26_12<=DESC)||LA26_12==SCORE) ) {s = 11;}
+
+                        else if ( (LA26_12==ID) ) {s = 13;}
+
+                        else if ( (LA26_12==DOUBLE_QUOTE) ) {s = 14;}
+
+                        else if ( (LA26_12==TIMESTAMP) ) {s = 15;}
+
+                        else if ( (LA26_12==TRUE) ) {s = 16;}
+
+                        else if ( (LA26_12==FALSE) ) {s = 17;}
+
+                        else if ( (LA26_12==FLOATING_POINT_LITERAL) ) {s = 18;}
+
+                        else if ( (LA26_12==DECIMAL_INTEGER_LITERAL) ) {s = 19;}
+
+                        else if ( (LA26_12==QUOTED_STRING) ) {s = 20;}
+
+                        else if ( (LA26_12==COLON) ) {s = 21;}
+
+                        else if ( (LA26_12==RPAREN) && ((strict == false))) {s = 22;}
+
+                         
+                        input.seek(index26_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA26_56 = input.LA(1);
+
+                         
+                        int index26_56 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_56==EQUALS||(LA26_56>=NOT && LA26_56<=IS)) ) {s = 11;}
+
+                        else if ( (LA26_56==RPAREN||(LA26_56>=COLON && LA26_56<=TIMESTAMP)) && ((strict == false))) {s = 22;}
+
+                         
+                        input.seek(index26_56);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA26_27 = input.LA(1);
+                        int LA26_54 = input.LA(1);
 
                          
-                        int index26_27 = input.index();
+                        int index26_54 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA26_27==IS) && ((strict == false))) {s = 39;}
+                        if ( (LA26_54==EQUALS||(LA26_54>=NOTEQUALS && LA26_54<=GREATERTHANOREQUALS)) ) {s = 11;}
 
-                        else if ( (LA26_27==DOT) && ((strict == false))) {s = 40;}
-
-                        else if ( (LA26_27==NOT) && ((strict == false))) {s = 41;}
-
-                        else if ( (LA26_27==IN) && ((strict == false))) {s = 42;}
-
-                        else if ( (LA26_27==LIKE) && ((strict == false))) {s = 43;}
-
-                        else if ( (LA26_27==EQUALS||(LA26_27>=NOTEQUALS && LA26_27<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 44;}
+                        else if ( (LA26_54==RPAREN||(LA26_54>=COLON && LA26_54<=TIMESTAMP)) && ((strict == false))) {s = 22;}
 
                          
-                        input.seek(index26_27);
+                        input.seek(index26_54);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA26_65 = input.LA(1);
+                        int LA26_117 = input.LA(1);
 
                          
-                        int index26_65 = input.index();
+                        int index26_117 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA26_65==IS) && ((strict == false))) {s = 39;}
+                        if ( (LA26_117==RPAREN||(LA26_117>=COLON && LA26_117<=TIMESTAMP)) && ((strict == false))) {s = 22;}
 
-                        else if ( (LA26_65==NOT) && ((strict == false))) {s = 41;}
-
-                        else if ( (LA26_65==IN) && ((strict == false))) {s = 42;}
-
-                        else if ( (LA26_65==LIKE) && ((strict == false))) {s = 43;}
-
-                        else if ( (LA26_65==EQUALS||(LA26_65>=NOTEQUALS && LA26_65<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 44;}
+                        else if ( (LA26_117==EQUALS||(LA26_117>=NOTEQUALS && LA26_117<=GREATERTHANOREQUALS)) ) {s = 11;}
 
                          
-                        input.seek(index26_65);
+                        input.seek(index26_117);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA26_64 = input.LA(1);
+                        int LA26_118 = input.LA(1);
 
                          
-                        int index26_64 = input.index();
+                        int index26_118 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA26_64==DOUBLE_QUOTE) && ((strict == false))) {s = 65;}
+                        if ( (LA26_118==EQUALS||(LA26_118>=NOT && LA26_118<=IS)) ) {s = 11;}
+
+                        else if ( (LA26_118==RPAREN||(LA26_118>=COLON && LA26_118<=TIMESTAMP)) && ((strict == false))) {s = 22;}
 
                          
-                        input.seek(index26_64);
+                        input.seek(index26_118);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA26_58 = input.LA(1);
+
+                         
+                        int index26_58 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_58==DOT) ) {s = 23;}
+
+                        else if ( (LA26_58==EQUALS||(LA26_58>=NOT && LA26_58<=IS)) ) {s = 11;}
+
+                        else if ( (LA26_58==RPAREN||(LA26_58>=COLON && LA26_58<=TIMESTAMP)) && ((strict == false))) {s = 22;}
+
+                         
+                        input.seek(index26_58);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA26_0 = input.LA(1);
+
+                         
+                        int index26_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA26_0==NOT) ) {s = 1;}
+
+                        else if ( (LA26_0==ID) ) {s = 2;}
+
+                        else if ( (LA26_0==DOUBLE_QUOTE) && ((strict == false))) {s = 3;}
+
+                        else if ( (LA26_0==SCORE) ) {s = 4;}
+
+                        else if ( (LA26_0==SELECT||LA26_0==AS||(LA26_0>=FROM && LA26_0<=ON)||(LA26_0>=WHERE && LA26_0<=AND)||(LA26_0>=IN && LA26_0<=NULL)) && ((strict == false))) {s = 5;}
+
+                        else if ( ((LA26_0>=ANY && LA26_0<=IN_TREE)) ) {s = 6;}
+
+                        else if ( ((LA26_0>=ORDER && LA26_0<=DESC)) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA26_0==QUOTED_STRING||(LA26_0>=FLOATING_POINT_LITERAL && LA26_0<=TIMESTAMP)) ) {s = 8;}
+
+                        else if ( (LA26_0==COLON) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA26_0==LPAREN) ) {s = 10;}
+
+                         
+                        input.seek(index26_0);
                         if ( s>=0 ) return s;
                         break;
             }
@@ -7903,49 +11708,3021 @@ public class CMISParser extends Parser {
             throw nvae;
         }
     }
+    static final String DFA27_eotS =
+        "\12\uffff";
+    static final String DFA27_eofS =
+        "\12\uffff";
+    static final String DFA27_minS =
+        "\1\37\11\uffff";
+    static final String DFA27_maxS =
+        "\1\114\11\uffff";
+    static final String DFA27_acceptS =
+        "\1\uffff\10\1\1\2";
+    static final String DFA27_specialS =
+        "\1\0\11\uffff}>";
+    static final String[] DFA27_transitionS = {
+            "\1\4\2\uffff\1\4\2\uffff\1\11\1\uffff\6\4\1\uffff\4\4\5\uffff"+
+            "\4\4\4\5\4\6\1\10\1\7\1\1\1\2\5\7\1\3",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            ""
+    };
+
+    static final short[] DFA27_eot = DFA.unpackEncodedString(DFA27_eotS);
+    static final short[] DFA27_eof = DFA.unpackEncodedString(DFA27_eofS);
+    static final char[] DFA27_min = DFA.unpackEncodedStringToUnsignedChars(DFA27_minS);
+    static final char[] DFA27_max = DFA.unpackEncodedStringToUnsignedChars(DFA27_maxS);
+    static final short[] DFA27_accept = DFA.unpackEncodedString(DFA27_acceptS);
+    static final short[] DFA27_special = DFA.unpackEncodedString(DFA27_specialS);
+    static final short[][] DFA27_transition;
+
+    static {
+        int numStates = DFA27_transitionS.length;
+        DFA27_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA27_transition[i] = DFA.unpackEncodedString(DFA27_transitionS[i]);
+        }
+    }
+
+    class DFA27 extends DFA {
+
+        public DFA27(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 27;
+            this.eot = DFA27_eot;
+            this.eof = DFA27_eof;
+            this.min = DFA27_min;
+            this.max = DFA27_max;
+            this.accept = DFA27_accept;
+            this.special = DFA27_special;
+            this.transition = DFA27_transition;
+        }
+        public String getDescription() {
+            return "456:1: searchTest : ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition );";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA27_0 = input.LA(1);
+
+                         
+                        int index27_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA27_0==ID) ) {s = 1;}
+
+                        else if ( (LA27_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
+
+                        else if ( (LA27_0==SCORE) ) {s = 3;}
+
+                        else if ( (LA27_0==SELECT||LA27_0==AS||(LA27_0>=FROM && LA27_0<=ON)||(LA27_0>=WHERE && LA27_0<=NOT)||(LA27_0>=IN && LA27_0<=NULL)) && ((strict == false))) {s = 4;}
+
+                        else if ( ((LA27_0>=ANY && LA27_0<=IN_TREE)) ) {s = 5;}
+
+                        else if ( ((LA27_0>=ORDER && LA27_0<=DESC)) && ((strict == false))) {s = 6;}
+
+                        else if ( (LA27_0==QUOTED_STRING||(LA27_0>=FLOATING_POINT_LITERAL && LA27_0<=TIMESTAMP)) ) {s = 7;}
+
+                        else if ( (LA27_0==COLON) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA27_0==LPAREN) ) {s = 9;}
+
+                         
+                        input.seek(index27_0);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 27, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String DFA28_eotS =
+        "\u00e5\uffff";
+    static final String DFA28_eofS =
+        "\u0083\uffff\1\145\36\uffff\1\u0084\35\uffff\1\u0084\44\uffff";
+    static final String DFA28_minS =
+        "\1\37\1\44\1\37\2\uffff\7\45\3\uffff\1\105\1\67\4\uffff\35\106"+
+        "\1\uffff\3\46\1\uffff\1\55\1\37\1\44\1\41\1\37\1\46\1\41\1\37\1"+
+        "\46\1\41\1\37\1\46\35\106\1\uffff\1\105\1\67\3\uffff\35\106\1\46"+
+        "\1\uffff\35\106\1\46\35\106\1\46\2\55\1\37\3\41\35\106\1\55";
+    static final String DFA28_maxS =
+        "\1\114\1\71\1\114\2\uffff\1\106\3\45\1\104\2\66\3\uffff\1\106\1"+
+        "\70\4\uffff\35\106\1\uffff\3\113\1\uffff\1\71\1\114\1\71\1\113\1"+
+        "\114\2\113\1\114\2\113\1\114\1\113\35\106\1\uffff\1\106\1\70\3\uffff"+
+        "\35\106\1\77\1\uffff\35\106\1\77\35\106\1\77\2\71\1\114\3\113\35"+
+        "\106\1\71";
+    static final String DFA28_acceptS =
+        "\3\uffff\2\1\7\uffff\2\5\1\4\2\uffff\1\3\1\2\2\1\35\uffff\1\6\3"+
+        "\uffff\1\5\51\uffff\1\4\2\uffff\1\3\1\2\1\7\36\uffff\1\10\140\uffff";
+    static final String DFA28_specialS =
+        "\1\41\1\55\1\116\2\uffff\1\112\3\uffff\1\110\1\44\1\45\11\uffff"+
+        "\1\106\1\70\1\75\1\60\1\43\1\32\1\24\1\14\1\11\1\1\1\122\1\117\1"+
+        "\101\1\74\1\71\1\50\1\0\1\7\1\12\1\21\1\31\1\34\1\52\1\57\1\66\1"+
+        "\105\1\111\1\121\1\10\1\uffff\1\35\1\64\1\63\3\uffff\1\3\1\23\1"+
+        "\uffff\1\72\1\17\1\uffff\1\40\1\16\1\uffff\1\37\36\uffff\1\27\1"+
+        "\53\40\uffff\1\2\36\uffff\1\103\35\uffff\1\77\1\uffff\1\47\1\124"+
+        "\1\15\1\6\1\5\1\13\1\22\1\20\1\30\1\25\1\26\1\36\1\33\1\46\1\42"+
+        "\1\51\1\54\1\61\1\56\1\62\1\65\1\67\1\73\1\76\1\100\1\102\1\104"+
+        "\1\107\1\113\1\115\1\120\1\123\1\125\1\114\1\4}>";
+    static final String[] DFA28_transitionS = {
+            "\1\4\2\uffff\1\4\4\uffff\6\4\1\uffff\4\4\5\uffff\4\4\1\5\1"+
+            "\6\1\7\1\10\4\4\1\15\1\14\1\1\1\2\2\14\1\12\1\13\1\11\1\3",
+            "\1\17\1\24\7\uffff\1\23\3\uffff\1\20\5\23\1\22\1\21\1\16",
+            "\1\25\2\uffff\1\26\4\uffff\1\27\1\30\1\31\1\32\1\33\1\34\1"+
+            "\uffff\1\35\1\36\1\37\1\40\5\uffff\1\41\1\42\1\43\1\44\1\45"+
+            "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\2\uffff\1\61\3\uffff\1\56"+
+            "\1\57\1\55\1\60",
+            "",
+            "",
+            "\1\24\37\uffff\2\62",
+            "\1\63",
+            "\1\64",
+            "\1\65",
+            "\1\24\36\uffff\1\66",
+            "\1\24\7\uffff\1\66\4\uffff\5\66",
+            "\1\24\7\uffff\1\66\4\uffff\5\66",
+            "",
+            "",
+            "",
+            "\1\67\1\70",
+            "\1\22\1\21",
+            "",
+            "",
+            "",
+            "",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "\1\71",
+            "",
+            "\1\24\34\uffff\1\24\1\74\1\72\1\73\5\24",
+            "\1\24\34\uffff\1\24\1\77\1\75\1\76\5\24",
+            "\1\24\34\uffff\1\24\1\102\1\100\1\101\5\24",
+            "",
+            "\1\23\3\uffff\1\20\5\23\1\22\1\21\1\16",
+            "\1\103\2\uffff\1\104\4\uffff\1\105\1\106\1\107\1\110\1\111"+
+            "\1\112\1\uffff\1\113\1\114\1\115\1\116\5\uffff\1\117\1\120\1"+
+            "\121\1\122\1\123\1\124\1\125\1\126\1\127\1\130\1\131\1\132\2"+
+            "\uffff\1\137\3\uffff\1\134\1\135\1\133\1\136",
+            "\1\141\10\uffff\1\24\3\uffff\1\142\5\24\1\144\1\143\1\140",
+            "\1\145\2\uffff\1\24\1\uffff\1\24\34\uffff\11\24",
+            "\1\146\2\uffff\1\147\4\uffff\1\150\1\151\1\152\1\153\1\154"+
+            "\1\155\1\uffff\1\156\1\157\1\160\1\161\5\uffff\1\162\1\163\1"+
+            "\164\1\165\1\166\1\167\1\170\1\171\1\172\1\173\1\174\1\175\2"+
+            "\uffff\1\u0082\3\uffff\1\177\1\u0080\1\176\1\u0081",
+            "\1\u0083\34\uffff\11\24",
+            "\1\u0084\2\uffff\1\24\1\uffff\1\24\34\uffff\11\24",
+            "\1\u0085\2\uffff\1\u0086\4\uffff\1\u0087\1\u0088\1\u0089\1"+
+            "\u008a\1\u008b\1\u008c\1\uffff\1\u008d\1\u008e\1\u008f\1\u0090"+
+            "\5\uffff\1\u0091\1\u0092\1\u0093\1\u0094\1\u0095\1\u0096\1\u0097"+
+            "\1\u0098\1\u0099\1\u009a\1\u009b\1\u009c\2\uffff\1\u00a1\3\uffff"+
+            "\1\u009e\1\u009f\1\u009d\1\u00a0",
+            "\1\u00a2\34\uffff\11\24",
+            "\1\u0084\2\uffff\1\24\1\uffff\1\24\34\uffff\11\24",
+            "\1\u00a3\2\uffff\1\u00a4\4\uffff\1\u00a5\1\u00a6\1\u00a7\1"+
+            "\u00a8\1\u00a9\1\u00aa\1\uffff\1\u00ab\1\u00ac\1\u00ad\1\u00ae"+
+            "\5\uffff\1\u00af\1\u00b0\1\u00b1\1\u00b2\1\u00b3\1\u00b4\1\u00b5"+
+            "\1\u00b6\1\u00b7\1\u00b8\1\u00b9\1\u00ba\2\uffff\1\u00bf\3\uffff"+
+            "\1\u00bc\1\u00bd\1\u00bb\1\u00be",
+            "\1\u00c0\34\uffff\11\24",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "\1\u00c1",
+            "",
+            "\1\u00c2\1\u00c3",
+            "\1\144\1\143",
+            "",
+            "",
+            "",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\u00c4",
+            "\1\145\6\uffff\1\24\1\uffff\2\145\1\uffff\5\24\10\uffff\1"+
+            "\145",
+            "",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u00c5",
+            "\1\u0084\6\uffff\1\24\1\uffff\2\u0084\1\uffff\5\24\10\uffff"+
+            "\1\u0084",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u00c6",
+            "\1\u0084\6\uffff\1\24\1\uffff\2\u0084\1\uffff\5\24\10\uffff"+
+            "\1\u0084",
+            "\1\23\3\uffff\1\20\5\23\1\22\1\21\1\16",
+            "\1\24\3\uffff\1\142\5\24\1\144\1\143\1\140",
+            "\1\u00c7\2\uffff\1\u00c8\4\uffff\1\u00c9\1\u00ca\1\u00cb\1"+
+            "\u00cc\1\u00cd\1\u00ce\1\uffff\1\u00cf\1\u00d0\1\u00d1\1\u00d2"+
+            "\5\uffff\1\u00d3\1\u00d4\1\u00d5\1\u00d6\1\u00d7\1\u00d8\1\u00d9"+
+            "\1\u00da\1\u00db\1\u00dc\1\u00dd\1\u00de\2\uffff\1\u00e3\3\uffff"+
+            "\1\u00e0\1\u00e1\1\u00df\1\u00e2",
+            "\1\145\2\uffff\1\24\1\uffff\1\24\34\uffff\11\24",
+            "\1\u0084\2\uffff\1\24\1\uffff\1\24\34\uffff\11\24",
+            "\1\u0084\2\uffff\1\24\1\uffff\1\24\34\uffff\11\24",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e4",
+            "\1\24\3\uffff\1\142\5\24\1\144\1\143\1\140"
+    };
+
+    static final short[] DFA28_eot = DFA.unpackEncodedString(DFA28_eotS);
+    static final short[] DFA28_eof = DFA.unpackEncodedString(DFA28_eofS);
+    static final char[] DFA28_min = DFA.unpackEncodedStringToUnsignedChars(DFA28_minS);
+    static final char[] DFA28_max = DFA.unpackEncodedStringToUnsignedChars(DFA28_maxS);
+    static final short[] DFA28_accept = DFA.unpackEncodedString(DFA28_acceptS);
+    static final short[] DFA28_special = DFA.unpackEncodedString(DFA28_specialS);
+    static final short[][] DFA28_transition;
+
+    static {
+        int numStates = DFA28_transitionS.length;
+        DFA28_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA28_transition[i] = DFA.unpackEncodedString(DFA28_transitionS[i]);
+        }
+    }
+
+    class DFA28 extends DFA {
+
+        public DFA28(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 28;
+            this.eot = DFA28_eot;
+            this.eof = DFA28_eof;
+            this.min = DFA28_min;
+            this.max = DFA28_max;
+            this.accept = DFA28_accept;
+            this.special = DFA28_special;
+            this.transition = DFA28_transition;
+        }
+        public String getDescription() {
+            return "463:1: predicate : ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate );";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA28_37 = input.LA(1);
+
+                         
+                        int index28_37 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_37==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_37);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA28_30 = input.LA(1);
+
+                         
+                        int index28_30 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_30==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_30);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA28_131 = input.LA(1);
+
+                         
+                        int index28_131 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_131==EOF||LA28_131==RPAREN||(LA28_131>=OR && LA28_131<=AND)||LA28_131==ORDER) ) {s = 101;}
+
+                        else if ( (LA28_131==EQUALS||(LA28_131>=NOTEQUALS && LA28_131<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_131);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA28_57 = input.LA(1);
+
+                         
+                        int index28_57 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_57==IS) && ((strict == false))) {s = 96;}
+
+                        else if ( (LA28_57==DOT) && ((strict == false))) {s = 97;}
+
+                        else if ( (LA28_57==NOT) && ((strict == false))) {s = 98;}
+
+                        else if ( (LA28_57==LIKE) && ((strict == false))) {s = 99;}
+
+                        else if ( (LA28_57==IN) && ((strict == false))) {s = 100;}
+
+                        else if ( (LA28_57==EQUALS||(LA28_57>=NOTEQUALS && LA28_57<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_57);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA28_228 = input.LA(1);
+
+                         
+                        int index28_228 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_228==IS) && ((strict == false))) {s = 96;}
+
+                        else if ( (LA28_228==NOT) && ((strict == false))) {s = 98;}
+
+                        else if ( (LA28_228==LIKE) && ((strict == false))) {s = 99;}
+
+                        else if ( (LA28_228==IN) && ((strict == false))) {s = 100;}
+
+                        else if ( (LA28_228==EQUALS||(LA28_228>=NOTEQUALS && LA28_228<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_228);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA28_198 = input.LA(1);
+
+                         
+                        int index28_198 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_198==DOT||LA28_198==RPAREN||(LA28_198>=COLON && LA28_198<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA28_198==COMMA) ) {s = 132;}
+
+                         
+                        input.seek(index28_198);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA28_197 = input.LA(1);
+
+                         
+                        int index28_197 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_197==DOT||LA28_197==RPAREN||(LA28_197>=COLON && LA28_197<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA28_197==COMMA) ) {s = 132;}
+
+                         
+                        input.seek(index28_197);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA28_38 = input.LA(1);
+
+                         
+                        int index28_38 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_38==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_38);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA28_49 = input.LA(1);
+
+                         
+                        int index28_49 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_49==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_49);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA28_29 = input.LA(1);
+
+                         
+                        int index28_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_29==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA28_39 = input.LA(1);
+
+                         
+                        int index28_39 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_39==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_39);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA28_199 = input.LA(1);
+
+                         
+                        int index28_199 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_199==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_199);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA28_28 = input.LA(1);
+
+                         
+                        int index28_28 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_28==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_28);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA28_196 = input.LA(1);
+
+                         
+                        int index28_196 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_196==DOT||LA28_196==RPAREN||(LA28_196>=COLON && LA28_196<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA28_196==COMMA) ) {s = 101;}
+
+                         
+                        input.seek(index28_196);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA28_64 = input.LA(1);
+
+                         
+                        int index28_64 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_64==COMMA) ) {s = 132;}
+
+                        else if ( (LA28_64==DOT||LA28_64==RPAREN||(LA28_64>=COLON && LA28_64<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_64);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA28_61 = input.LA(1);
+
+                         
+                        int index28_61 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_61==COMMA) ) {s = 132;}
+
+                        else if ( (LA28_61==DOT||LA28_61==RPAREN||(LA28_61>=COLON && LA28_61<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_61);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA28_201 = input.LA(1);
+
+                         
+                        int index28_201 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_201==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_201);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA28_40 = input.LA(1);
+
+                         
+                        int index28_40 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_40==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_40);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
+                        int LA28_200 = input.LA(1);
+
+                         
+                        int index28_200 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_200==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_200);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 19 : 
+                        int LA28_58 = input.LA(1);
+
+                         
+                        int index28_58 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_58==COMMA) ) {s = 101;}
+
+                        else if ( (LA28_58==DOT||LA28_58==RPAREN||(LA28_58>=COLON && LA28_58<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_58);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA28_27 = input.LA(1);
+
+                         
+                        int index28_27 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_27==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_27);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA28_203 = input.LA(1);
+
+                         
+                        int index28_203 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_203==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_203);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA28_204 = input.LA(1);
+
+                         
+                        int index28_204 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_204==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_204);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA28_97 = input.LA(1);
+
+                         
+                        int index28_97 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_97==ID) && ((strict == false))) {s = 194;}
+
+                        else if ( (LA28_97==DOUBLE_QUOTE) && ((strict == false))) {s = 195;}
+
+                         
+                        input.seek(index28_97);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA28_202 = input.LA(1);
+
+                         
+                        int index28_202 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_202==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_202);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA28_41 = input.LA(1);
+
+                         
+                        int index28_41 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_41==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_41);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA28_26 = input.LA(1);
+
+                         
+                        int index28_26 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_26==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_26);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA28_206 = input.LA(1);
+
+                         
+                        int index28_206 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_206==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_206);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA28_42 = input.LA(1);
+
+                         
+                        int index28_42 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_42==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_42);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA28_51 = input.LA(1);
+
+                         
+                        int index28_51 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_51==ID) ) {s = 58;}
+
+                        else if ( (LA28_51==DOUBLE_QUOTE) ) {s = 59;}
+
+                        else if ( (LA28_51==RPAREN||LA28_51==COLON||(LA28_51>=FLOATING_POINT_LITERAL && LA28_51<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA28_51==QUOTED_STRING) ) {s = 60;}
+
+                         
+                        input.seek(index28_51);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA28_205 = input.LA(1);
+
+                         
+                        int index28_205 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_205==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_205);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA28_66 = input.LA(1);
+
+                         
+                        int index28_66 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_66==RPAREN) ) {s = 192;}
+
+                        else if ( ((LA28_66>=COLON && LA28_66<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_66);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 32 : 
+                        int LA28_63 = input.LA(1);
+
+                         
+                        int index28_63 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_63==RPAREN) ) {s = 162;}
+
+                        else if ( ((LA28_63>=COLON && LA28_63<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_63);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 33 : 
+                        int LA28_0 = input.LA(1);
+
+                         
+                        int index28_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_0==ID) ) {s = 1;}
+
+                        else if ( (LA28_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
+
+                        else if ( (LA28_0==SCORE) ) {s = 3;}
+
+                        else if ( (LA28_0==SELECT||LA28_0==AS||(LA28_0>=FROM && LA28_0<=ON)||(LA28_0>=WHERE && LA28_0<=NOT)||(LA28_0>=IN && LA28_0<=NULL)||(LA28_0>=ORDER && LA28_0<=DESC)) && ((strict == false))) {s = 4;}
+
+                        else if ( (LA28_0==ANY) ) {s = 5;}
+
+                        else if ( (LA28_0==CONTAINS) ) {s = 6;}
+
+                        else if ( (LA28_0==IN_FOLDER) ) {s = 7;}
+
+                        else if ( (LA28_0==IN_TREE) ) {s = 8;}
+
+                        else if ( (LA28_0==TIMESTAMP) ) {s = 9;}
+
+                        else if ( (LA28_0==TRUE) ) {s = 10;}
+
+                        else if ( (LA28_0==FALSE) ) {s = 11;}
+
+                        else if ( (LA28_0==QUOTED_STRING||(LA28_0>=FLOATING_POINT_LITERAL && LA28_0<=DECIMAL_INTEGER_LITERAL)) ) {s = 12;}
+
+                        else if ( (LA28_0==COLON) && ((strict == false))) {s = 13;}
+
+                         
+                        input.seek(index28_0);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 34 : 
+                        int LA28_208 = input.LA(1);
+
+                         
+                        int index28_208 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_208==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_208);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 35 : 
+                        int LA28_25 = input.LA(1);
+
+                         
+                        int index28_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_25==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_25);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 36 : 
+                        int LA28_10 = input.LA(1);
+
+                         
+                        int index28_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_10==LPAREN) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA28_10==EQUALS||(LA28_10>=NOTEQUALS && LA28_10<=GREATERTHANOREQUALS)) ) {s = 54;}
+
+                         
+                        input.seek(index28_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 37 : 
+                        int LA28_11 = input.LA(1);
+
+                         
+                        int index28_11 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_11==LPAREN) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA28_11==EQUALS||(LA28_11>=NOTEQUALS && LA28_11<=GREATERTHANOREQUALS)) ) {s = 54;}
+
+                         
+                        input.seek(index28_11);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 38 : 
+                        int LA28_207 = input.LA(1);
+
+                         
+                        int index28_207 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_207==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_207);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 39 : 
+                        int LA28_194 = input.LA(1);
+
+                         
+                        int index28_194 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_194==IS) && ((strict == false))) {s = 96;}
+
+                        else if ( (LA28_194==NOT) && ((strict == false))) {s = 98;}
+
+                        else if ( (LA28_194==LIKE) && ((strict == false))) {s = 99;}
+
+                        else if ( (LA28_194==IN) && ((strict == false))) {s = 100;}
+
+                        else if ( (LA28_194==EQUALS||(LA28_194>=NOTEQUALS && LA28_194<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_194);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 40 : 
+                        int LA28_36 = input.LA(1);
+
+                         
+                        int index28_36 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_36==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_36);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 41 : 
+                        int LA28_209 = input.LA(1);
+
+                         
+                        int index28_209 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_209==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_209);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 42 : 
+                        int LA28_43 = input.LA(1);
+
+                         
+                        int index28_43 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_43==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_43);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 43 : 
+                        int LA28_98 = input.LA(1);
+
+                         
+                        int index28_98 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_98==IN) && ((strict == false))) {s = 100;}
+
+                        else if ( (LA28_98==LIKE) && ((strict == false))) {s = 99;}
+
+                         
+                        input.seek(index28_98);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 44 : 
+                        int LA28_210 = input.LA(1);
+
+                         
+                        int index28_210 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_210==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_210);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 45 : 
+                        int LA28_1 = input.LA(1);
+
+                         
+                        int index28_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_1==IS) ) {s = 14;}
+
+                        else if ( (LA28_1==DOT) ) {s = 15;}
+
+                        else if ( (LA28_1==NOT) ) {s = 16;}
+
+                        else if ( (LA28_1==LIKE) ) {s = 17;}
+
+                        else if ( (LA28_1==IN) ) {s = 18;}
+
+                        else if ( (LA28_1==EQUALS||(LA28_1>=NOTEQUALS && LA28_1<=GREATERTHANOREQUALS)) ) {s = 19;}
+
+                        else if ( (LA28_1==LPAREN) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_1);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 46 : 
+                        int LA28_212 = input.LA(1);
+
+                         
+                        int index28_212 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_212==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_212);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 47 : 
+                        int LA28_44 = input.LA(1);
+
+                         
+                        int index28_44 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_44==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_44);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 48 : 
+                        int LA28_24 = input.LA(1);
+
+                         
+                        int index28_24 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_24==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_24);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 49 : 
+                        int LA28_211 = input.LA(1);
+
+                         
+                        int index28_211 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_211==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_211);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 50 : 
+                        int LA28_213 = input.LA(1);
+
+                         
+                        int index28_213 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_213==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_213);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 51 : 
+                        int LA28_53 = input.LA(1);
+
+                         
+                        int index28_53 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_53==ID) ) {s = 64;}
+
+                        else if ( (LA28_53==DOUBLE_QUOTE) ) {s = 65;}
+
+                        else if ( (LA28_53==RPAREN||LA28_53==COLON||(LA28_53>=FLOATING_POINT_LITERAL && LA28_53<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA28_53==QUOTED_STRING) ) {s = 66;}
+
+                         
+                        input.seek(index28_53);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 52 : 
+                        int LA28_52 = input.LA(1);
+
+                         
+                        int index28_52 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_52==ID) ) {s = 61;}
+
+                        else if ( (LA28_52==DOUBLE_QUOTE) ) {s = 62;}
+
+                        else if ( (LA28_52==RPAREN||LA28_52==COLON||(LA28_52>=FLOATING_POINT_LITERAL && LA28_52<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA28_52==QUOTED_STRING) ) {s = 63;}
+
+                         
+                        input.seek(index28_52);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 53 : 
+                        int LA28_214 = input.LA(1);
+
+                         
+                        int index28_214 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_214==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_214);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 54 : 
+                        int LA28_45 = input.LA(1);
+
+                         
+                        int index28_45 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_45==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_45);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 55 : 
+                        int LA28_215 = input.LA(1);
+
+                         
+                        int index28_215 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_215==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_215);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 56 : 
+                        int LA28_22 = input.LA(1);
+
+                         
+                        int index28_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_22==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 57 : 
+                        int LA28_35 = input.LA(1);
+
+                         
+                        int index28_35 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_35==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_35);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 58 : 
+                        int LA28_60 = input.LA(1);
+
+                         
+                        int index28_60 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_60==RPAREN) ) {s = 131;}
+
+                        else if ( ((LA28_60>=COLON && LA28_60<=TIMESTAMP)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_60);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 59 : 
+                        int LA28_216 = input.LA(1);
+
+                         
+                        int index28_216 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_216==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_216);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 60 : 
+                        int LA28_34 = input.LA(1);
+
+                         
+                        int index28_34 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_34==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_34);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 61 : 
+                        int LA28_23 = input.LA(1);
+
+                         
+                        int index28_23 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_23==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_23);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 62 : 
+                        int LA28_217 = input.LA(1);
+
+                         
+                        int index28_217 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_217==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_217);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 63 : 
+                        int LA28_192 = input.LA(1);
+
+                         
+                        int index28_192 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_192==EOF||LA28_192==RPAREN||(LA28_192>=OR && LA28_192<=AND)||LA28_192==ORDER) ) {s = 132;}
+
+                        else if ( (LA28_192==EQUALS||(LA28_192>=NOTEQUALS && LA28_192<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_192);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 64 : 
+                        int LA28_218 = input.LA(1);
+
+                         
+                        int index28_218 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_218==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_218);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 65 : 
+                        int LA28_33 = input.LA(1);
+
+                         
+                        int index28_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_33==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 66 : 
+                        int LA28_219 = input.LA(1);
+
+                         
+                        int index28_219 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_219==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_219);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 67 : 
+                        int LA28_162 = input.LA(1);
+
+                         
+                        int index28_162 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_162==EOF||LA28_162==RPAREN||(LA28_162>=OR && LA28_162<=AND)||LA28_162==ORDER) ) {s = 132;}
+
+                        else if ( (LA28_162==EQUALS||(LA28_162>=NOTEQUALS && LA28_162<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_162);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 68 : 
+                        int LA28_220 = input.LA(1);
+
+                         
+                        int index28_220 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_220==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_220);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 69 : 
+                        int LA28_46 = input.LA(1);
+
+                         
+                        int index28_46 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_46==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_46);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 70 : 
+                        int LA28_21 = input.LA(1);
+
+                         
+                        int index28_21 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_21==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_21);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 71 : 
+                        int LA28_221 = input.LA(1);
+
+                         
+                        int index28_221 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_221==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_221);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 72 : 
+                        int LA28_9 = input.LA(1);
+
+                         
+                        int index28_9 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_9==QUOTED_STRING) ) {s = 54;}
+
+                        else if ( (LA28_9==LPAREN) && ((strict == false))) {s = 20;}
+
+                         
+                        input.seek(index28_9);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 73 : 
+                        int LA28_47 = input.LA(1);
+
+                         
+                        int index28_47 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_47==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_47);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 74 : 
+                        int LA28_5 = input.LA(1);
+
+                         
+                        int index28_5 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_5==LPAREN) && ((strict == false))) {s = 20;}
+
+                        else if ( ((LA28_5>=ID && LA28_5<=DOUBLE_QUOTE)) ) {s = 50;}
+
+                         
+                        input.seek(index28_5);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 75 : 
+                        int LA28_222 = input.LA(1);
+
+                         
+                        int index28_222 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_222==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_222);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 76 : 
+                        int LA28_227 = input.LA(1);
+
+                         
+                        int index28_227 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_227==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_227);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 77 : 
+                        int LA28_223 = input.LA(1);
+
+                         
+                        int index28_223 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_223==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_223);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 78 : 
+                        int LA28_2 = input.LA(1);
+
+                         
+                        int index28_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_2==SELECT) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA28_2==AS) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA28_2==FROM) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA28_2==JOIN) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA28_2==INNER) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA28_2==LEFT) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA28_2==OUTER) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA28_2==ON) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA28_2==WHERE) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA28_2==OR) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA28_2==AND) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA28_2==NOT) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA28_2==IN) && ((strict == false))) {s = 33;}
+
+                        else if ( (LA28_2==LIKE) && ((strict == false))) {s = 34;}
+
+                        else if ( (LA28_2==IS) && ((strict == false))) {s = 35;}
+
+                        else if ( (LA28_2==NULL) && ((strict == false))) {s = 36;}
+
+                        else if ( (LA28_2==ANY) && ((strict == false))) {s = 37;}
+
+                        else if ( (LA28_2==CONTAINS) && ((strict == false))) {s = 38;}
+
+                        else if ( (LA28_2==IN_FOLDER) && ((strict == false))) {s = 39;}
+
+                        else if ( (LA28_2==IN_TREE) && ((strict == false))) {s = 40;}
+
+                        else if ( (LA28_2==ORDER) && ((strict == false))) {s = 41;}
+
+                        else if ( (LA28_2==BY) && ((strict == false))) {s = 42;}
+
+                        else if ( (LA28_2==ASC) && ((strict == false))) {s = 43;}
+
+                        else if ( (LA28_2==DESC) && ((strict == false))) {s = 44;}
+
+                        else if ( (LA28_2==TIMESTAMP) && ((strict == false))) {s = 45;}
+
+                        else if ( (LA28_2==TRUE) && ((strict == false))) {s = 46;}
+
+                        else if ( (LA28_2==FALSE) && ((strict == false))) {s = 47;}
+
+                        else if ( (LA28_2==SCORE) && ((strict == false))) {s = 48;}
+
+                        else if ( (LA28_2==ID) && ((strict == false))) {s = 49;}
+
+                         
+                        input.seek(index28_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 79 : 
+                        int LA28_32 = input.LA(1);
+
+                         
+                        int index28_32 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_32==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_32);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 80 : 
+                        int LA28_224 = input.LA(1);
+
+                         
+                        int index28_224 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_224==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_224);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 81 : 
+                        int LA28_48 = input.LA(1);
+
+                         
+                        int index28_48 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_48==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_48);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 82 : 
+                        int LA28_31 = input.LA(1);
+
+                         
+                        int index28_31 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_31==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index28_31);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 83 : 
+                        int LA28_225 = input.LA(1);
+
+                         
+                        int index28_225 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_225==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_225);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 84 : 
+                        int LA28_195 = input.LA(1);
+
+                         
+                        int index28_195 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_195==SELECT) && ((strict == false))) {s = 199;}
+
+                        else if ( (LA28_195==AS) && ((strict == false))) {s = 200;}
+
+                        else if ( (LA28_195==FROM) && ((strict == false))) {s = 201;}
+
+                        else if ( (LA28_195==JOIN) && ((strict == false))) {s = 202;}
+
+                        else if ( (LA28_195==INNER) && ((strict == false))) {s = 203;}
+
+                        else if ( (LA28_195==LEFT) && ((strict == false))) {s = 204;}
+
+                        else if ( (LA28_195==OUTER) && ((strict == false))) {s = 205;}
+
+                        else if ( (LA28_195==ON) && ((strict == false))) {s = 206;}
+
+                        else if ( (LA28_195==WHERE) && ((strict == false))) {s = 207;}
+
+                        else if ( (LA28_195==OR) && ((strict == false))) {s = 208;}
+
+                        else if ( (LA28_195==AND) && ((strict == false))) {s = 209;}
+
+                        else if ( (LA28_195==NOT) && ((strict == false))) {s = 210;}
+
+                        else if ( (LA28_195==IN) && ((strict == false))) {s = 211;}
+
+                        else if ( (LA28_195==LIKE) && ((strict == false))) {s = 212;}
+
+                        else if ( (LA28_195==IS) && ((strict == false))) {s = 213;}
+
+                        else if ( (LA28_195==NULL) && ((strict == false))) {s = 214;}
+
+                        else if ( (LA28_195==ANY) && ((strict == false))) {s = 215;}
+
+                        else if ( (LA28_195==CONTAINS) && ((strict == false))) {s = 216;}
+
+                        else if ( (LA28_195==IN_FOLDER) && ((strict == false))) {s = 217;}
+
+                        else if ( (LA28_195==IN_TREE) && ((strict == false))) {s = 218;}
+
+                        else if ( (LA28_195==ORDER) && ((strict == false))) {s = 219;}
+
+                        else if ( (LA28_195==BY) && ((strict == false))) {s = 220;}
+
+                        else if ( (LA28_195==ASC) && ((strict == false))) {s = 221;}
+
+                        else if ( (LA28_195==DESC) && ((strict == false))) {s = 222;}
+
+                        else if ( (LA28_195==TIMESTAMP) && ((strict == false))) {s = 223;}
+
+                        else if ( (LA28_195==TRUE) && ((strict == false))) {s = 224;}
+
+                        else if ( (LA28_195==FALSE) && ((strict == false))) {s = 225;}
+
+                        else if ( (LA28_195==SCORE) && ((strict == false))) {s = 226;}
+
+                        else if ( (LA28_195==ID) && ((strict == false))) {s = 227;}
+
+                         
+                        input.seek(index28_195);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 85 : 
+                        int LA28_226 = input.LA(1);
+
+                         
+                        int index28_226 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA28_226==DOUBLE_QUOTE) && ((strict == false))) {s = 228;}
+
+                         
+                        input.seek(index28_226);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 28, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String DFA36_eotS =
+        "\151\uffff";
+    static final String DFA36_eofS =
+        "\151\uffff";
+    static final String DFA36_minS =
+        "\1\105\1\44\1\37\1\105\1\61\35\106\1\71\1\37\2\uffff\1\44\35\106"+
+        "\1\61\1\105\1\71\2\uffff\1\71\1\37\35\106\1\71";
+    static final String DFA36_maxS =
+        "\1\106\1\71\1\114\1\106\1\72\35\106\1\71\1\114\2\uffff\1\71\35"+
+        "\106\1\72\1\106\1\71\2\uffff\1\71\1\114\35\106\1\71";
+    static final String DFA36_acceptS =
+        "\44\uffff\1\2\1\1\41\uffff\1\1\1\2\40\uffff";
+    static final String DFA36_specialS =
+        "\1\41\1\uffff\1\16\2\uffff\1\45\1\30\1\37\1\22\1\13\1\3\1\11\1"+
+        "\65\1\76\1\52\1\42\1\56\1\27\1\35\1\33\1\1\1\15\1\67\1\71\1\100"+
+        "\1\44\1\55\1\60\1\25\1\32\1\2\1\10\1\62\1\47\4\uffff\1\36\35\uffff"+
+        "\1\17\1\4\3\uffff\1\24\1\50\1\31\1\34\1\40\1\20\1\21\1\23\1\26\1"+
+        "\53\1\51\1\46\1\43\1\63\1\61\1\57\1\54\1\72\1\70\1\66\1\64\1\101"+
+        "\1\77\1\75\1\74\1\6\1\7\1\0\1\5\1\73\1\12\1\14}>";
+    static final String[] DFA36_transitionS = {
+            "\1\1\1\2",
+            "\1\3\24\uffff\1\4",
+            "\1\5\2\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\uffff"+
+            "\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1"+
+            "\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\41\3\uffff\1\36\1\37"+
+            "\1\35\1\40",
+            "\1\42\1\43",
+            "\1\44\10\uffff\1\45",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\46",
+            "\1\4",
+            "\1\47\2\uffff\1\50\4\uffff\1\51\1\52\1\53\1\54\1\55\1\56\1"+
+            "\uffff\1\57\1\60\1\61\1\62\5\uffff\1\63\1\64\1\65\1\66\1\67"+
+            "\1\70\1\71\1\72\1\73\1\74\1\75\1\76\2\uffff\1\103\3\uffff\1"+
+            "\100\1\101\1\77\1\102",
+            "",
+            "",
+            "\1\105\24\uffff\1\104",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\110\10\uffff\1\107",
+            "\1\111\1\112",
+            "\1\4",
+            "",
+            "",
+            "\1\104",
+            "\1\113\2\uffff\1\114\4\uffff\1\115\1\116\1\117\1\120\1\121"+
+            "\1\122\1\uffff\1\123\1\124\1\125\1\126\5\uffff\1\127\1\130\1"+
+            "\131\1\132\1\133\1\134\1\135\1\136\1\137\1\140\1\141\1\142\2"+
+            "\uffff\1\147\3\uffff\1\144\1\145\1\143\1\146",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\150",
+            "\1\104"
+    };
+
+    static final short[] DFA36_eot = DFA.unpackEncodedString(DFA36_eotS);
+    static final short[] DFA36_eof = DFA.unpackEncodedString(DFA36_eofS);
+    static final char[] DFA36_min = DFA.unpackEncodedStringToUnsignedChars(DFA36_minS);
+    static final char[] DFA36_max = DFA.unpackEncodedStringToUnsignedChars(DFA36_maxS);
+    static final short[] DFA36_accept = DFA.unpackEncodedString(DFA36_acceptS);
+    static final short[] DFA36_special = DFA.unpackEncodedString(DFA36_specialS);
+    static final short[][] DFA36_transition;
+
+    static {
+        int numStates = DFA36_transitionS.length;
+        DFA36_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA36_transition[i] = DFA.unpackEncodedString(DFA36_transitionS[i]);
+        }
+    }
+
+    class DFA36 extends DFA {
+
+        public DFA36(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 36;
+            this.eot = DFA36_eot;
+            this.eof = DFA36_eof;
+            this.min = DFA36_min;
+            this.max = DFA36_max;
+            this.accept = DFA36_accept;
+            this.special = DFA36_special;
+            this.transition = DFA36_transition;
+        }
+        public String getDescription() {
+            return "515:1: nullPredicate : ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) );";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA36_100 = input.LA(1);
+
+                         
+                        int index36_100 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_100==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_100);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA36_20 = input.LA(1);
+
+                         
+                        int index36_20 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_20==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_20);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA36_30 = input.LA(1);
+
+                         
+                        int index36_30 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_30==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_30);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA36_10 = input.LA(1);
+
+                         
+                        int index36_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_10==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA36_69 = input.LA(1);
+
+                         
+                        int index36_69 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_69==ID) && ((strict == false))) {s = 73;}
+
+                        else if ( (LA36_69==DOUBLE_QUOTE) && ((strict == false))) {s = 74;}
+
+                         
+                        input.seek(index36_69);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA36_101 = input.LA(1);
+
+                         
+                        int index36_101 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_101==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_101);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA36_98 = input.LA(1);
+
+                         
+                        int index36_98 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_98==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_98);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA36_99 = input.LA(1);
+
+                         
+                        int index36_99 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_99==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_99);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA36_31 = input.LA(1);
+
+                         
+                        int index36_31 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_31==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_31);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA36_11 = input.LA(1);
+
+                         
+                        int index36_11 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_11==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_11);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA36_103 = input.LA(1);
+
+                         
+                        int index36_103 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_103==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_103);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA36_9 = input.LA(1);
+
+                         
+                        int index36_9 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_9==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_9);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA36_104 = input.LA(1);
+
+                         
+                        int index36_104 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_104==IS) && ((strict == false))) {s = 68;}
+
+                         
+                        input.seek(index36_104);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA36_21 = input.LA(1);
+
+                         
+                        int index36_21 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_21==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_21);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA36_2 = input.LA(1);
+
+                         
+                        int index36_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_2==SELECT) && ((strict == false))) {s = 5;}
+
+                        else if ( (LA36_2==AS) && ((strict == false))) {s = 6;}
+
+                        else if ( (LA36_2==FROM) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA36_2==JOIN) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA36_2==INNER) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA36_2==LEFT) && ((strict == false))) {s = 10;}
+
+                        else if ( (LA36_2==OUTER) && ((strict == false))) {s = 11;}
+
+                        else if ( (LA36_2==ON) && ((strict == false))) {s = 12;}
+
+                        else if ( (LA36_2==WHERE) && ((strict == false))) {s = 13;}
+
+                        else if ( (LA36_2==OR) && ((strict == false))) {s = 14;}
+
+                        else if ( (LA36_2==AND) && ((strict == false))) {s = 15;}
+
+                        else if ( (LA36_2==NOT) && ((strict == false))) {s = 16;}
+
+                        else if ( (LA36_2==IN) && ((strict == false))) {s = 17;}
+
+                        else if ( (LA36_2==LIKE) && ((strict == false))) {s = 18;}
+
+                        else if ( (LA36_2==IS) && ((strict == false))) {s = 19;}
+
+                        else if ( (LA36_2==NULL) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA36_2==ANY) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA36_2==CONTAINS) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA36_2==IN_FOLDER) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA36_2==IN_TREE) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA36_2==ORDER) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA36_2==BY) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA36_2==ASC) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA36_2==DESC) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA36_2==TIMESTAMP) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA36_2==TRUE) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA36_2==FALSE) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA36_2==SCORE) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA36_2==ID) && ((strict == false))) {s = 33;}
+
+                         
+                        input.seek(index36_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA36_68 = input.LA(1);
+
+                         
+                        int index36_68 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_68==NULL) && ((strict == false))) {s = 71;}
+
+                        else if ( (LA36_68==NOT) && ((strict == false))) {s = 72;}
+
+                         
+                        input.seek(index36_68);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA36_78 = input.LA(1);
+
+                         
+                        int index36_78 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_78==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_78);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA36_79 = input.LA(1);
+
+                         
+                        int index36_79 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_79==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_79);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
+                        int LA36_8 = input.LA(1);
+
+                         
+                        int index36_8 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_8==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_8);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 19 : 
+                        int LA36_80 = input.LA(1);
+
+                         
+                        int index36_80 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_80==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_80);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA36_73 = input.LA(1);
+
+                         
+                        int index36_73 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_73==IS) && ((strict == false))) {s = 68;}
+
+                         
+                        input.seek(index36_73);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA36_28 = input.LA(1);
+
+                         
+                        int index36_28 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_28==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_28);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA36_81 = input.LA(1);
+
+                         
+                        int index36_81 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_81==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_81);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA36_17 = input.LA(1);
+
+                         
+                        int index36_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_17==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA36_6 = input.LA(1);
+
+                         
+                        int index36_6 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_6==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_6);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA36_75 = input.LA(1);
+
+                         
+                        int index36_75 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_75==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_75);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA36_29 = input.LA(1);
+
+                         
+                        int index36_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_29==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA36_19 = input.LA(1);
+
+                         
+                        int index36_19 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_19==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_19);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA36_76 = input.LA(1);
+
+                         
+                        int index36_76 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_76==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_76);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA36_18 = input.LA(1);
+
+                         
+                        int index36_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_18==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA36_38 = input.LA(1);
+
+                         
+                        int index36_38 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_38==IS) && ((strict == false))) {s = 68;}
+
+                        else if ( (LA36_38==DOT) && ((strict == false))) {s = 69;}
+
+                         
+                        input.seek(index36_38);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA36_7 = input.LA(1);
+
+                         
+                        int index36_7 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_7==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_7);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 32 : 
+                        int LA36_77 = input.LA(1);
+
+                         
+                        int index36_77 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_77==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_77);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 33 : 
+                        int LA36_0 = input.LA(1);
+
+                         
+                        int index36_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_0==ID) ) {s = 1;}
+
+                        else if ( (LA36_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
+
+                         
+                        input.seek(index36_0);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 34 : 
+                        int LA36_15 = input.LA(1);
+
+                         
+                        int index36_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_15==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_15);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 35 : 
+                        int LA36_85 = input.LA(1);
+
+                         
+                        int index36_85 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_85==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_85);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 36 : 
+                        int LA36_25 = input.LA(1);
+
+                         
+                        int index36_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_25==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_25);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 37 : 
+                        int LA36_5 = input.LA(1);
+
+                         
+                        int index36_5 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_5==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_5);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 38 : 
+                        int LA36_84 = input.LA(1);
+
+                         
+                        int index36_84 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_84==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_84);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 39 : 
+                        int LA36_33 = input.LA(1);
+
+                         
+                        int index36_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_33==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 40 : 
+                        int LA36_74 = input.LA(1);
+
+                         
+                        int index36_74 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_74==SELECT) && ((strict == false))) {s = 75;}
+
+                        else if ( (LA36_74==AS) && ((strict == false))) {s = 76;}
+
+                        else if ( (LA36_74==FROM) && ((strict == false))) {s = 77;}
+
+                        else if ( (LA36_74==JOIN) && ((strict == false))) {s = 78;}
+
+                        else if ( (LA36_74==INNER) && ((strict == false))) {s = 79;}
+
+                        else if ( (LA36_74==LEFT) && ((strict == false))) {s = 80;}
+
+                        else if ( (LA36_74==OUTER) && ((strict == false))) {s = 81;}
+
+                        else if ( (LA36_74==ON) && ((strict == false))) {s = 82;}
+
+                        else if ( (LA36_74==WHERE) && ((strict == false))) {s = 83;}
+
+                        else if ( (LA36_74==OR) && ((strict == false))) {s = 84;}
+
+                        else if ( (LA36_74==AND) && ((strict == false))) {s = 85;}
+
+                        else if ( (LA36_74==NOT) && ((strict == false))) {s = 86;}
+
+                        else if ( (LA36_74==IN) && ((strict == false))) {s = 87;}
+
+                        else if ( (LA36_74==LIKE) && ((strict == false))) {s = 88;}
+
+                        else if ( (LA36_74==IS) && ((strict == false))) {s = 89;}
+
+                        else if ( (LA36_74==NULL) && ((strict == false))) {s = 90;}
+
+                        else if ( (LA36_74==ANY) && ((strict == false))) {s = 91;}
+
+                        else if ( (LA36_74==CONTAINS) && ((strict == false))) {s = 92;}
+
+                        else if ( (LA36_74==IN_FOLDER) && ((strict == false))) {s = 93;}
+
+                        else if ( (LA36_74==IN_TREE) && ((strict == false))) {s = 94;}
+
+                        else if ( (LA36_74==ORDER) && ((strict == false))) {s = 95;}
+
+                        else if ( (LA36_74==BY) && ((strict == false))) {s = 96;}
+
+                        else if ( (LA36_74==ASC) && ((strict == false))) {s = 97;}
+
+                        else if ( (LA36_74==DESC) && ((strict == false))) {s = 98;}
+
+                        else if ( (LA36_74==TIMESTAMP) && ((strict == false))) {s = 99;}
+
+                        else if ( (LA36_74==TRUE) && ((strict == false))) {s = 100;}
+
+                        else if ( (LA36_74==FALSE) && ((strict == false))) {s = 101;}
+
+                        else if ( (LA36_74==SCORE) && ((strict == false))) {s = 102;}
+
+                        else if ( (LA36_74==ID) && ((strict == false))) {s = 103;}
+
+                         
+                        input.seek(index36_74);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 41 : 
+                        int LA36_83 = input.LA(1);
+
+                         
+                        int index36_83 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_83==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_83);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 42 : 
+                        int LA36_14 = input.LA(1);
+
+                         
+                        int index36_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_14==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 43 : 
+                        int LA36_82 = input.LA(1);
+
+                         
+                        int index36_82 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_82==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_82);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 44 : 
+                        int LA36_89 = input.LA(1);
+
+                         
+                        int index36_89 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_89==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_89);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 45 : 
+                        int LA36_26 = input.LA(1);
+
+                         
+                        int index36_26 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_26==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_26);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 46 : 
+                        int LA36_16 = input.LA(1);
+
+                         
+                        int index36_16 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_16==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_16);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 47 : 
+                        int LA36_88 = input.LA(1);
+
+                         
+                        int index36_88 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_88==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_88);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 48 : 
+                        int LA36_27 = input.LA(1);
+
+                         
+                        int index36_27 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_27==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_27);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 49 : 
+                        int LA36_87 = input.LA(1);
+
+                         
+                        int index36_87 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_87==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_87);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 50 : 
+                        int LA36_32 = input.LA(1);
+
+                         
+                        int index36_32 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_32==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_32);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 51 : 
+                        int LA36_86 = input.LA(1);
+
+                         
+                        int index36_86 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_86==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_86);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 52 : 
+                        int LA36_93 = input.LA(1);
+
+                         
+                        int index36_93 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_93==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_93);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 53 : 
+                        int LA36_12 = input.LA(1);
+
+                         
+                        int index36_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_12==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 54 : 
+                        int LA36_92 = input.LA(1);
+
+                         
+                        int index36_92 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_92==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_92);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 55 : 
+                        int LA36_22 = input.LA(1);
+
+                         
+                        int index36_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_22==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 56 : 
+                        int LA36_91 = input.LA(1);
+
+                         
+                        int index36_91 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_91==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_91);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 57 : 
+                        int LA36_23 = input.LA(1);
+
+                         
+                        int index36_23 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_23==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_23);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 58 : 
+                        int LA36_90 = input.LA(1);
+
+                         
+                        int index36_90 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_90==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_90);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 59 : 
+                        int LA36_102 = input.LA(1);
+
+                         
+                        int index36_102 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_102==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_102);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 60 : 
+                        int LA36_97 = input.LA(1);
+
+                         
+                        int index36_97 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_97==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_97);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 61 : 
+                        int LA36_96 = input.LA(1);
+
+                         
+                        int index36_96 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_96==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_96);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 62 : 
+                        int LA36_13 = input.LA(1);
+
+                         
+                        int index36_13 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_13==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 63 : 
+                        int LA36_95 = input.LA(1);
+
+                         
+                        int index36_95 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_95==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_95);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 64 : 
+                        int LA36_24 = input.LA(1);
+
+                         
+                        int index36_24 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_24==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index36_24);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 65 : 
+                        int LA36_94 = input.LA(1);
+
+                         
+                        int index36_94 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_94==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
+
+                         
+                        input.seek(index36_94);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 36, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
     static final String DFA34_eotS =
-        "\30\uffff";
+        "\77\uffff";
     static final String DFA34_eofS =
-        "\30\uffff";
+        "\77\uffff";
     static final String DFA34_minS =
-        "\1\105\1\44\1\37\1\61\1\105\2\106\2\uffff\1\71\1\37\1\44\2\106"+
-        "\1\105\1\61\2\71\1\37\2\uffff\2\106\1\71";
+        "\1\105\1\0\1\37\2\uffff\35\106\35\0";
     static final String DFA34_maxS =
-        "\1\106\1\71\1\113\1\72\3\106\2\uffff\1\71\1\113\1\71\3\106\1\72"+
-        "\2\71\1\113\2\uffff\2\106\1\71";
+        "\1\106\1\0\1\114\2\uffff\35\106\35\0";
     static final String DFA34_acceptS =
-        "\7\uffff\1\1\1\2\12\uffff\1\2\1\1\3\uffff";
+        "\3\uffff\1\1\1\2\72\uffff";
     static final String DFA34_specialS =
-        "\1\1\1\uffff\1\11\2\uffff\1\10\1\2\4\uffff\1\13\2\uffff\1\12\1"+
-        "\5\1\uffff\1\3\1\4\2\uffff\1\7\1\0\1\6}>";
+        "\1\62\1\72\1\44\2\uffff\1\57\1\50\1\54\1\45\1\42\1\2\1\4\1\67\1"+
+        "\73\1\61\1\55\1\64\1\47\1\53\1\52\1\0\1\43\1\70\1\71\1\74\1\56\1"+
+        "\63\1\65\1\46\1\51\1\1\1\3\1\66\1\60\1\23\1\24\1\25\1\26\1\27\1"+
+        "\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\22\1\21\1\20"+
+        "\1\17\1\16\1\15\1\14\1\13\1\12\1\11\1\10\1\7\1\6\1\5}>";
     static final String[] DFA34_transitionS = {
             "\1\1\1\2",
-            "\1\4\24\uffff\1\3",
-            "\1\5\2\uffff\1\5\4\uffff\6\5\1\uffff\4\5\5\uffff\14\5\2\uffff"+
-            "\1\6\3\uffff\3\5",
-            "\1\10\10\uffff\1\7",
-            "\1\11\1\12",
-            "\1\13",
-            "\1\13",
+            "\1\uffff",
+            "\1\5\2\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\uffff"+
+            "\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1"+
+            "\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\41\3\uffff\1\36\1\37"+
+            "\1\35\1\40",
             "",
             "",
-            "\1\3",
-            "\1\14\2\uffff\1\14\4\uffff\6\14\1\uffff\4\14\5\uffff\14\14"+
-            "\2\uffff\1\15\3\uffff\3\14",
-            "\1\16\24\uffff\1\17",
-            "\1\20",
-            "\1\20",
-            "\1\21\1\22",
-            "\1\23\10\uffff\1\24",
-            "\1\3",
-            "\1\17",
-            "\1\25\2\uffff\1\25\4\uffff\6\25\1\uffff\4\25\5\uffff\14\25"+
-            "\2\uffff\1\26\3\uffff\3\25",
-            "",
-            "",
-            "\1\27",
-            "\1\27",
-            "\1\17"
+            "\1\42",
+            "\1\43",
+            "\1\44",
+            "\1\45",
+            "\1\46",
+            "\1\47",
+            "\1\50",
+            "\1\51",
+            "\1\52",
+            "\1\53",
+            "\1\54",
+            "\1\55",
+            "\1\56",
+            "\1\57",
+            "\1\60",
+            "\1\61",
+            "\1\62",
+            "\1\63",
+            "\1\64",
+            "\1\65",
+            "\1\66",
+            "\1\67",
+            "\1\70",
+            "\1\71",
+            "\1\72",
+            "\1\73",
+            "\1\74",
+            "\1\75",
+            "\1\76",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff"
     };
 
     static final short[] DFA34_eot = DFA.unpackEncodedString(DFA34_eotS);
@@ -7978,26 +14755,777 @@ public class CMISParser extends Parser {
             this.transition = DFA34_transition;
         }
         public String getDescription() {
-            return "361:1: nullPredicate : ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) );";
+            return "516:4: ( ( columnReference )=> columnReference | multiValuedColumnReference )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA34_22 = input.LA(1);
+                        int LA34_20 = input.LA(1);
 
                          
-                        int index34_22 = input.index();
+                        int index34_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_22==DOUBLE_QUOTE) && ((strict == false))) {s = 23;}
+                        if ( (LA34_20==DOUBLE_QUOTE) && ((strict == false))) {s = 49;}
 
                          
-                        input.seek(index34_22);
+                        input.seek(index34_20);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
+                        int LA34_30 = input.LA(1);
+
+                         
+                        int index34_30 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_30==DOUBLE_QUOTE) && ((strict == false))) {s = 59;}
+
+                         
+                        input.seek(index34_30);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA34_10 = input.LA(1);
+
+                         
+                        int index34_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_10==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
+
+                         
+                        input.seek(index34_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA34_31 = input.LA(1);
+
+                         
+                        int index34_31 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_31==DOUBLE_QUOTE) && ((strict == false))) {s = 60;}
+
+                         
+                        input.seek(index34_31);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA34_11 = input.LA(1);
+
+                         
+                        int index34_11 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_11==DOUBLE_QUOTE) && ((strict == false))) {s = 40;}
+
+                         
+                        input.seek(index34_11);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA34_62 = input.LA(1);
+
+                         
+                        int index34_62 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_62);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA34_61 = input.LA(1);
+
+                         
+                        int index34_61 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_61);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA34_60 = input.LA(1);
+
+                         
+                        int index34_60 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_60);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA34_59 = input.LA(1);
+
+                         
+                        int index34_59 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_59);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA34_58 = input.LA(1);
+
+                         
+                        int index34_58 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_58);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA34_57 = input.LA(1);
+
+                         
+                        int index34_57 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_57);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA34_56 = input.LA(1);
+
+                         
+                        int index34_56 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_56);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA34_55 = input.LA(1);
+
+                         
+                        int index34_55 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_55);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA34_54 = input.LA(1);
+
+                         
+                        int index34_54 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_54);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA34_53 = input.LA(1);
+
+                         
+                        int index34_53 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_53);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA34_52 = input.LA(1);
+
+                         
+                        int index34_52 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_52);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA34_51 = input.LA(1);
+
+                         
+                        int index34_51 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_51);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA34_50 = input.LA(1);
+
+                         
+                        int index34_50 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_50);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
+                        int LA34_49 = input.LA(1);
+
+                         
+                        int index34_49 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_49);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 19 : 
+                        int LA34_34 = input.LA(1);
+
+                         
+                        int index34_34 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_34);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA34_35 = input.LA(1);
+
+                         
+                        int index34_35 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_35);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA34_36 = input.LA(1);
+
+                         
+                        int index34_36 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_36);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA34_37 = input.LA(1);
+
+                         
+                        int index34_37 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_37);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA34_38 = input.LA(1);
+
+                         
+                        int index34_38 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_38);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA34_39 = input.LA(1);
+
+                         
+                        int index34_39 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_39);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA34_40 = input.LA(1);
+
+                         
+                        int index34_40 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_40);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA34_41 = input.LA(1);
+
+                         
+                        int index34_41 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_41);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA34_42 = input.LA(1);
+
+                         
+                        int index34_42 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_42);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA34_43 = input.LA(1);
+
+                         
+                        int index34_43 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_43);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA34_44 = input.LA(1);
+
+                         
+                        int index34_44 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_44);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA34_45 = input.LA(1);
+
+                         
+                        int index34_45 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_45);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA34_46 = input.LA(1);
+
+                         
+                        int index34_46 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_46);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 32 : 
+                        int LA34_47 = input.LA(1);
+
+                         
+                        int index34_47 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_47);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 33 : 
+                        int LA34_48 = input.LA(1);
+
+                         
+                        int index34_48 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false))||(synpred3_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index34_48);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 34 : 
+                        int LA34_9 = input.LA(1);
+
+                         
+                        int index34_9 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_9==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
+
+                         
+                        input.seek(index34_9);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 35 : 
+                        int LA34_21 = input.LA(1);
+
+                         
+                        int index34_21 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_21==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
+
+                         
+                        input.seek(index34_21);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 36 : 
+                        int LA34_2 = input.LA(1);
+
+                         
+                        int index34_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_2==SELECT) && ((strict == false))) {s = 5;}
+
+                        else if ( (LA34_2==AS) && ((strict == false))) {s = 6;}
+
+                        else if ( (LA34_2==FROM) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA34_2==JOIN) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA34_2==INNER) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA34_2==LEFT) && ((strict == false))) {s = 10;}
+
+                        else if ( (LA34_2==OUTER) && ((strict == false))) {s = 11;}
+
+                        else if ( (LA34_2==ON) && ((strict == false))) {s = 12;}
+
+                        else if ( (LA34_2==WHERE) && ((strict == false))) {s = 13;}
+
+                        else if ( (LA34_2==OR) && ((strict == false))) {s = 14;}
+
+                        else if ( (LA34_2==AND) && ((strict == false))) {s = 15;}
+
+                        else if ( (LA34_2==NOT) && ((strict == false))) {s = 16;}
+
+                        else if ( (LA34_2==IN) && ((strict == false))) {s = 17;}
+
+                        else if ( (LA34_2==LIKE) && ((strict == false))) {s = 18;}
+
+                        else if ( (LA34_2==IS) && ((strict == false))) {s = 19;}
+
+                        else if ( (LA34_2==NULL) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA34_2==ANY) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA34_2==CONTAINS) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA34_2==IN_FOLDER) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA34_2==IN_TREE) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA34_2==ORDER) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA34_2==BY) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA34_2==ASC) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA34_2==DESC) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA34_2==TIMESTAMP) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA34_2==TRUE) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA34_2==FALSE) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA34_2==SCORE) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA34_2==ID) && ((strict == false))) {s = 33;}
+
+                         
+                        input.seek(index34_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 37 : 
+                        int LA34_8 = input.LA(1);
+
+                         
+                        int index34_8 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_8==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index34_8);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 38 : 
+                        int LA34_28 = input.LA(1);
+
+                         
+                        int index34_28 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_28==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
+
+                         
+                        input.seek(index34_28);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 39 : 
+                        int LA34_17 = input.LA(1);
+
+                         
+                        int index34_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_17==DOUBLE_QUOTE) && ((strict == false))) {s = 46;}
+
+                         
+                        input.seek(index34_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 40 : 
+                        int LA34_6 = input.LA(1);
+
+                         
+                        int index34_6 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_6==DOUBLE_QUOTE) && ((strict == false))) {s = 35;}
+
+                         
+                        input.seek(index34_6);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 41 : 
+                        int LA34_29 = input.LA(1);
+
+                         
+                        int index34_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_29==DOUBLE_QUOTE) && ((strict == false))) {s = 58;}
+
+                         
+                        input.seek(index34_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 42 : 
+                        int LA34_19 = input.LA(1);
+
+                         
+                        int index34_19 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_19==DOUBLE_QUOTE) && ((strict == false))) {s = 48;}
+
+                         
+                        input.seek(index34_19);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 43 : 
+                        int LA34_18 = input.LA(1);
+
+                         
+                        int index34_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_18==DOUBLE_QUOTE) && ((strict == false))) {s = 47;}
+
+                         
+                        input.seek(index34_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 44 : 
+                        int LA34_7 = input.LA(1);
+
+                         
+                        int index34_7 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_7==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index34_7);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 45 : 
+                        int LA34_15 = input.LA(1);
+
+                         
+                        int index34_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_15==DOUBLE_QUOTE) && ((strict == false))) {s = 44;}
+
+                         
+                        input.seek(index34_15);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 46 : 
+                        int LA34_25 = input.LA(1);
+
+                         
+                        int index34_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_25==DOUBLE_QUOTE) && ((strict == false))) {s = 54;}
+
+                         
+                        input.seek(index34_25);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 47 : 
+                        int LA34_5 = input.LA(1);
+
+                         
+                        int index34_5 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_5==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index34_5);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 48 : 
+                        int LA34_33 = input.LA(1);
+
+                         
+                        int index34_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_33==DOUBLE_QUOTE) && ((strict == false))) {s = 62;}
+
+                         
+                        input.seek(index34_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 49 : 
+                        int LA34_14 = input.LA(1);
+
+                         
+                        int index34_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_14==DOUBLE_QUOTE) && ((strict == false))) {s = 43;}
+
+                         
+                        input.seek(index34_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 50 : 
                         int LA34_0 = input.LA(1);
 
                          
@@ -8012,144 +15540,136 @@ public class CMISParser extends Parser {
                         input.seek(index34_0);
                         if ( s>=0 ) return s;
                         break;
-                    case 2 : 
-                        int LA34_6 = input.LA(1);
+                    case 51 : 
+                        int LA34_26 = input.LA(1);
 
                          
-                        int index34_6 = input.index();
+                        int index34_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_6==DOUBLE_QUOTE) && ((strict == false))) {s = 11;}
+                        if ( (LA34_26==DOUBLE_QUOTE) && ((strict == false))) {s = 55;}
 
                          
-                        input.seek(index34_6);
+                        input.seek(index34_26);
                         if ( s>=0 ) return s;
                         break;
-                    case 3 : 
-                        int LA34_17 = input.LA(1);
+                    case 52 : 
+                        int LA34_16 = input.LA(1);
 
                          
-                        int index34_17 = input.index();
+                        int index34_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_17==IS) && ((strict == false))) {s = 15;}
+                        if ( (LA34_16==DOUBLE_QUOTE) && ((strict == false))) {s = 45;}
 
                          
-                        input.seek(index34_17);
+                        input.seek(index34_16);
                         if ( s>=0 ) return s;
                         break;
-                    case 4 : 
-                        int LA34_18 = input.LA(1);
+                    case 53 : 
+                        int LA34_27 = input.LA(1);
 
                          
-                        int index34_18 = input.index();
+                        int index34_27 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_18==SELECT||LA34_18==AS||(LA34_18>=FROM && LA34_18<=ON)||(LA34_18>=WHERE && LA34_18<=NOT)||(LA34_18>=IN && LA34_18<=DESC)||(LA34_18>=TRUE && LA34_18<=TIMESTAMP)) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA34_18==ID) && ((strict == false))) {s = 22;}
+                        if ( (LA34_27==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
 
                          
-                        input.seek(index34_18);
+                        input.seek(index34_27);
                         if ( s>=0 ) return s;
                         break;
-                    case 5 : 
-                        int LA34_15 = input.LA(1);
+                    case 54 : 
+                        int LA34_32 = input.LA(1);
 
                          
-                        int index34_15 = input.index();
+                        int index34_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_15==NOT) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA34_15==NULL) && ((strict == false))) {s = 20;}
+                        if ( (LA34_32==DOUBLE_QUOTE) && ((strict == false))) {s = 61;}
 
                          
-                        input.seek(index34_15);
+                        input.seek(index34_32);
                         if ( s>=0 ) return s;
                         break;
-                    case 6 : 
+                    case 55 : 
+                        int LA34_12 = input.LA(1);
+
+                         
+                        int index34_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_12==DOUBLE_QUOTE) && ((strict == false))) {s = 41;}
+
+                         
+                        input.seek(index34_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 56 : 
+                        int LA34_22 = input.LA(1);
+
+                         
+                        int index34_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA34_22==DOUBLE_QUOTE) && ((strict == false))) {s = 51;}
+
+                         
+                        input.seek(index34_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 57 : 
                         int LA34_23 = input.LA(1);
 
                          
                         int index34_23 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_23==IS) && ((strict == false))) {s = 15;}
+                        if ( (LA34_23==DOUBLE_QUOTE) && ((strict == false))) {s = 52;}
 
                          
                         input.seek(index34_23);
                         if ( s>=0 ) return s;
                         break;
-                    case 7 : 
-                        int LA34_21 = input.LA(1);
+                    case 58 : 
+                        int LA34_1 = input.LA(1);
 
                          
-                        int index34_21 = input.index();
+                        int index34_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_21==DOUBLE_QUOTE) && ((strict == false))) {s = 23;}
+                        if ( (synpred3_CMIS()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index34_21);
+                        input.seek(index34_1);
                         if ( s>=0 ) return s;
                         break;
-                    case 8 : 
-                        int LA34_5 = input.LA(1);
+                    case 59 : 
+                        int LA34_13 = input.LA(1);
 
                          
-                        int index34_5 = input.index();
+                        int index34_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_5==DOUBLE_QUOTE) && ((strict == false))) {s = 11;}
+                        if ( (LA34_13==DOUBLE_QUOTE) && ((strict == false))) {s = 42;}
 
                          
-                        input.seek(index34_5);
+                        input.seek(index34_13);
                         if ( s>=0 ) return s;
                         break;
-                    case 9 : 
-                        int LA34_2 = input.LA(1);
+                    case 60 : 
+                        int LA34_24 = input.LA(1);
 
                          
-                        int index34_2 = input.index();
+                        int index34_24 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA34_2==SELECT||LA34_2==AS||(LA34_2>=FROM && LA34_2<=ON)||(LA34_2>=WHERE && LA34_2<=NOT)||(LA34_2>=IN && LA34_2<=DESC)||(LA34_2>=TRUE && LA34_2<=TIMESTAMP)) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA34_2==ID) && ((strict == false))) {s = 6;}
+                        if ( (LA34_24==DOUBLE_QUOTE) && ((strict == false))) {s = 53;}
 
                          
-                        input.seek(index34_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA34_14 = input.LA(1);
-
-                         
-                        int index34_14 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_14==ID) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA34_14==DOUBLE_QUOTE) && ((strict == false))) {s = 18;}
-
-                         
-                        input.seek(index34_14);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA34_11 = input.LA(1);
-
-                         
-                        int index34_11 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_11==DOT) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA34_11==IS) && ((strict == false))) {s = 15;}
-
-                         
-                        input.seek(index34_11);
+                        input.seek(index34_24);
                         if ( s>=0 ) return s;
                         break;
             }
@@ -8160,443 +15680,2415 @@ public class CMISParser extends Parser {
             throw nvae;
         }
     }
-    static final String DFA41_eotS =
-        "\32\uffff";
-    static final String DFA41_eofS =
-        "\1\uffff\1\5\6\uffff\1\5\1\uffff\1\16\5\uffff\1\23\1\26\7\uffff"+
-        "\1\26";
-    static final String DFA41_minS =
-        "\1\105\1\41\1\37\1\uffff\1\105\1\uffff\2\106\1\41\1\37\1\41\2\106"+
-        "\1\105\2\uffff\2\41\1\37\4\uffff\2\106\1\41";
-    static final String DFA41_maxS =
-        "\1\106\1\102\1\113\1\uffff\1\106\1\uffff\2\106\1\102\1\113\1\102"+
-        "\3\106\2\uffff\2\102\1\113\4\uffff\2\106\1\102";
-    static final String DFA41_acceptS =
-        "\3\uffff\1\2\1\uffff\1\1\10\uffff\1\1\1\2\3\uffff\1\1\2\2\1\1\3"+
-        "\uffff";
-    static final String DFA41_specialS =
-        "\1\10\1\uffff\1\6\3\uffff\1\12\1\7\2\uffff\1\5\2\uffff\1\11\3\uffff"+
-        "\1\2\1\3\4\uffff\1\4\1\1\1\0}>";
-    static final String[] DFA41_transitionS = {
+    static final String DFA35_eotS =
+        "\77\uffff";
+    static final String DFA35_eofS =
+        "\77\uffff";
+    static final String DFA35_minS =
+        "\1\105\1\0\1\37\2\uffff\35\106\35\0";
+    static final String DFA35_maxS =
+        "\1\106\1\0\1\114\2\uffff\35\106\35\0";
+    static final String DFA35_acceptS =
+        "\3\uffff\1\1\1\2\72\uffff";
+    static final String DFA35_specialS =
+        "\1\32\1\24\1\7\2\uffff\1\22\1\13\1\17\1\10\1\5\1\2\1\4\1\33\1\73"+
+        "\1\25\1\20\1\27\1\12\1\16\1\15\1\0\1\6\1\34\1\53\1\74\1\21\1\26"+
+        "\1\30\1\11\1\14\1\1\1\3\1\31\1\23\1\54\1\55\1\56\1\57\1\60\1\61"+
+        "\1\62\1\63\1\64\1\65\1\66\1\67\1\70\1\71\1\72\1\52\1\51\1\50\1\47"+
+        "\1\46\1\45\1\44\1\43\1\42\1\41\1\40\1\37\1\36\1\35}>";
+    static final String[] DFA35_transitionS = {
             "\1\1\1\2",
-            "\1\5\2\uffff\1\4\34\uffff\2\3",
-            "\1\6\2\uffff\1\6\4\uffff\6\6\1\uffff\4\6\5\uffff\14\6\2\uffff"+
-            "\1\7\3\uffff\3\6",
-            "",
-            "\1\10\1\11",
-            "",
-            "\1\12",
-            "\1\12",
-            "\1\5\37\uffff\2\3",
-            "\1\13\2\uffff\1\13\4\uffff\6\13\1\uffff\4\13\5\uffff\14\13"+
-            "\2\uffff\1\14\3\uffff\3\13",
-            "\1\16\2\uffff\1\15\34\uffff\2\17",
-            "\1\20",
-            "\1\20",
-            "\1\21\1\22",
+            "\1\uffff",
+            "\1\5\2\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\uffff"+
+            "\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1"+
+            "\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\41\3\uffff\1\36\1\37"+
+            "\1\35\1\40",
             "",
             "",
-            "\1\5\37\uffff\1\3\1\24",
-            "\1\16\37\uffff\1\17\1\25",
-            "\1\27\2\uffff\1\27\4\uffff\6\27\1\uffff\4\27\5\uffff\14\27"+
-            "\2\uffff\1\30\3\uffff\3\27",
-            "",
-            "",
-            "",
-            "",
-            "\1\31",
-            "\1\31",
-            "\1\16\37\uffff\1\17\1\25"
+            "\1\42",
+            "\1\43",
+            "\1\44",
+            "\1\45",
+            "\1\46",
+            "\1\47",
+            "\1\50",
+            "\1\51",
+            "\1\52",
+            "\1\53",
+            "\1\54",
+            "\1\55",
+            "\1\56",
+            "\1\57",
+            "\1\60",
+            "\1\61",
+            "\1\62",
+            "\1\63",
+            "\1\64",
+            "\1\65",
+            "\1\66",
+            "\1\67",
+            "\1\70",
+            "\1\71",
+            "\1\72",
+            "\1\73",
+            "\1\74",
+            "\1\75",
+            "\1\76",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff"
     };
 
-    static final short[] DFA41_eot = DFA.unpackEncodedString(DFA41_eotS);
-    static final short[] DFA41_eof = DFA.unpackEncodedString(DFA41_eofS);
-    static final char[] DFA41_min = DFA.unpackEncodedStringToUnsignedChars(DFA41_minS);
-    static final char[] DFA41_max = DFA.unpackEncodedStringToUnsignedChars(DFA41_maxS);
-    static final short[] DFA41_accept = DFA.unpackEncodedString(DFA41_acceptS);
-    static final short[] DFA41_special = DFA.unpackEncodedString(DFA41_specialS);
-    static final short[][] DFA41_transition;
+    static final short[] DFA35_eot = DFA.unpackEncodedString(DFA35_eotS);
+    static final short[] DFA35_eof = DFA.unpackEncodedString(DFA35_eofS);
+    static final char[] DFA35_min = DFA.unpackEncodedStringToUnsignedChars(DFA35_minS);
+    static final char[] DFA35_max = DFA.unpackEncodedStringToUnsignedChars(DFA35_maxS);
+    static final short[] DFA35_accept = DFA.unpackEncodedString(DFA35_acceptS);
+    static final short[] DFA35_special = DFA.unpackEncodedString(DFA35_specialS);
+    static final short[][] DFA35_transition;
 
     static {
-        int numStates = DFA41_transitionS.length;
-        DFA41_transition = new short[numStates][];
+        int numStates = DFA35_transitionS.length;
+        DFA35_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA41_transition[i] = DFA.unpackEncodedString(DFA41_transitionS[i]);
+            DFA35_transition[i] = DFA.unpackEncodedString(DFA35_transitionS[i]);
         }
     }
 
-    class DFA41 extends DFA {
+    class DFA35 extends DFA {
 
-        public DFA41(BaseRecognizer recognizer) {
+        public DFA35(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 41;
-            this.eot = DFA41_eot;
-            this.eof = DFA41_eof;
-            this.min = DFA41_min;
-            this.max = DFA41_max;
-            this.accept = DFA41_accept;
-            this.special = DFA41_special;
-            this.transition = DFA41_transition;
+            this.decisionNumber = 35;
+            this.eot = DFA35_eot;
+            this.eof = DFA35_eof;
+            this.min = DFA35_min;
+            this.max = DFA35_max;
+            this.accept = DFA35_accept;
+            this.special = DFA35_special;
+            this.transition = DFA35_transition;
         }
         public String getDescription() {
-            return "403:1: sortSpecification : ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) );";
+            return "518:9: ( ( columnReference )=> columnReference | multiValuedColumnReference )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA41_25 = input.LA(1);
+                        int LA35_20 = input.LA(1);
 
                          
-                        int index41_25 = input.index();
+                        int index35_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_25==COMMA) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA41_25==EOF) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA41_25==ASC) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA41_25==DESC) && ((strict == false))) {s = 21;}
+                        if ( (LA35_20==DOUBLE_QUOTE) && ((strict == false))) {s = 49;}
 
                          
-                        input.seek(index41_25);
+                        input.seek(index35_20);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA41_24 = input.LA(1);
+                        int LA35_30 = input.LA(1);
 
                          
-                        int index41_24 = input.index();
+                        int index35_30 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_24==DOUBLE_QUOTE) && ((strict == false))) {s = 25;}
+                        if ( (LA35_30==DOUBLE_QUOTE) && ((strict == false))) {s = 59;}
 
                          
-                        input.seek(index41_24);
+                        input.seek(index35_30);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA41_17 = input.LA(1);
+                        int LA35_10 = input.LA(1);
 
                          
-                        int index41_17 = input.index();
+                        int index35_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_17==ASC) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA41_17==DESC) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA41_17==COMMA) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA41_17==EOF) && ((strict == false))) {s = 22;}
+                        if ( (LA35_10==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
 
                          
-                        input.seek(index41_17);
+                        input.seek(index35_10);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA41_18 = input.LA(1);
+                        int LA35_31 = input.LA(1);
 
                          
-                        int index41_18 = input.index();
+                        int index35_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_18==SELECT||LA41_18==AS||(LA41_18>=FROM && LA41_18<=ON)||(LA41_18>=WHERE && LA41_18<=NOT)||(LA41_18>=IN && LA41_18<=DESC)||(LA41_18>=TRUE && LA41_18<=TIMESTAMP)) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA41_18==ID) && ((strict == false))) {s = 24;}
+                        if ( (LA35_31==DOUBLE_QUOTE) && ((strict == false))) {s = 60;}
 
                          
-                        input.seek(index41_18);
+                        input.seek(index35_31);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA41_23 = input.LA(1);
+                        int LA35_11 = input.LA(1);
 
                          
-                        int index41_23 = input.index();
+                        int index35_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_23==DOUBLE_QUOTE) && ((strict == false))) {s = 25;}
+                        if ( (LA35_11==DOUBLE_QUOTE) && ((strict == false))) {s = 40;}
 
                          
-                        input.seek(index41_23);
+                        input.seek(index35_11);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA41_10 = input.LA(1);
+                        int LA35_9 = input.LA(1);
 
                          
-                        int index41_10 = input.index();
+                        int index35_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_10==DOT) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA41_10==EOF||LA41_10==COMMA) && ((strict == false))) {s = 14;}
-
-                        else if ( ((LA41_10>=ASC && LA41_10<=DESC)) && ((strict == false))) {s = 15;}
+                        if ( (LA35_9==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
 
                          
-                        input.seek(index41_10);
+                        input.seek(index35_9);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA41_2 = input.LA(1);
+                        int LA35_21 = input.LA(1);
 
                          
-                        int index41_2 = input.index();
+                        int index35_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_2==SELECT||LA41_2==AS||(LA41_2>=FROM && LA41_2<=ON)||(LA41_2>=WHERE && LA41_2<=NOT)||(LA41_2>=IN && LA41_2<=DESC)||(LA41_2>=TRUE && LA41_2<=TIMESTAMP)) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA41_2==ID) && ((strict == false))) {s = 7;}
+                        if ( (LA35_21==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
 
                          
-                        input.seek(index41_2);
+                        input.seek(index35_21);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA41_7 = input.LA(1);
+                        int LA35_2 = input.LA(1);
 
                          
-                        int index41_7 = input.index();
+                        int index35_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_7==DOUBLE_QUOTE) && ((strict == false))) {s = 10;}
+                        if ( (LA35_2==SELECT) && ((strict == false))) {s = 5;}
+
+                        else if ( (LA35_2==AS) && ((strict == false))) {s = 6;}
+
+                        else if ( (LA35_2==FROM) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA35_2==JOIN) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA35_2==INNER) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA35_2==LEFT) && ((strict == false))) {s = 10;}
+
+                        else if ( (LA35_2==OUTER) && ((strict == false))) {s = 11;}
+
+                        else if ( (LA35_2==ON) && ((strict == false))) {s = 12;}
+
+                        else if ( (LA35_2==WHERE) && ((strict == false))) {s = 13;}
+
+                        else if ( (LA35_2==OR) && ((strict == false))) {s = 14;}
+
+                        else if ( (LA35_2==AND) && ((strict == false))) {s = 15;}
+
+                        else if ( (LA35_2==NOT) && ((strict == false))) {s = 16;}
+
+                        else if ( (LA35_2==IN) && ((strict == false))) {s = 17;}
+
+                        else if ( (LA35_2==LIKE) && ((strict == false))) {s = 18;}
+
+                        else if ( (LA35_2==IS) && ((strict == false))) {s = 19;}
+
+                        else if ( (LA35_2==NULL) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA35_2==ANY) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA35_2==CONTAINS) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA35_2==IN_FOLDER) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA35_2==IN_TREE) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA35_2==ORDER) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA35_2==BY) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA35_2==ASC) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA35_2==DESC) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA35_2==TIMESTAMP) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA35_2==TRUE) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA35_2==FALSE) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA35_2==SCORE) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA35_2==ID) && ((strict == false))) {s = 33;}
 
                          
-                        input.seek(index41_7);
+                        input.seek(index35_2);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA41_0 = input.LA(1);
+                        int LA35_8 = input.LA(1);
 
                          
-                        int index41_0 = input.index();
+                        int index35_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_0==ID) ) {s = 1;}
-
-                        else if ( (LA41_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
+                        if ( (LA35_8==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
 
                          
-                        input.seek(index41_0);
+                        input.seek(index35_8);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA41_13 = input.LA(1);
+                        int LA35_28 = input.LA(1);
 
                          
-                        int index41_13 = input.index();
+                        int index35_28 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_13==ID) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA41_13==DOUBLE_QUOTE) && ((strict == false))) {s = 18;}
+                        if ( (LA35_28==DOUBLE_QUOTE) && ((strict == false))) {s = 57;}
 
                          
-                        input.seek(index41_13);
+                        input.seek(index35_28);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA41_6 = input.LA(1);
+                        int LA35_17 = input.LA(1);
 
                          
-                        int index41_6 = input.index();
+                        int index35_17 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_6==DOUBLE_QUOTE) && ((strict == false))) {s = 10;}
+                        if ( (LA35_17==DOUBLE_QUOTE) && ((strict == false))) {s = 46;}
 
                          
-                        input.seek(index41_6);
+                        input.seek(index35_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA35_6 = input.LA(1);
+
+                         
+                        int index35_6 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_6==DOUBLE_QUOTE) && ((strict == false))) {s = 35;}
+
+                         
+                        input.seek(index35_6);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA35_29 = input.LA(1);
+
+                         
+                        int index35_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_29==DOUBLE_QUOTE) && ((strict == false))) {s = 58;}
+
+                         
+                        input.seek(index35_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA35_19 = input.LA(1);
+
+                         
+                        int index35_19 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_19==DOUBLE_QUOTE) && ((strict == false))) {s = 48;}
+
+                         
+                        input.seek(index35_19);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA35_18 = input.LA(1);
+
+                         
+                        int index35_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_18==DOUBLE_QUOTE) && ((strict == false))) {s = 47;}
+
+                         
+                        input.seek(index35_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA35_7 = input.LA(1);
+
+                         
+                        int index35_7 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_7==DOUBLE_QUOTE) && ((strict == false))) {s = 36;}
+
+                         
+                        input.seek(index35_7);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA35_15 = input.LA(1);
+
+                         
+                        int index35_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_15==DOUBLE_QUOTE) && ((strict == false))) {s = 44;}
+
+                         
+                        input.seek(index35_15);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA35_25 = input.LA(1);
+
+                         
+                        int index35_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_25==DOUBLE_QUOTE) && ((strict == false))) {s = 54;}
+
+                         
+                        input.seek(index35_25);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
+                        int LA35_5 = input.LA(1);
+
+                         
+                        int index35_5 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_5==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index35_5);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 19 : 
+                        int LA35_33 = input.LA(1);
+
+                         
+                        int index35_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_33==DOUBLE_QUOTE) && ((strict == false))) {s = 62;}
+
+                         
+                        input.seek(index35_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA35_1 = input.LA(1);
+
+                         
+                        int index35_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred4_CMIS()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 4;}
+
+                         
+                        input.seek(index35_1);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA35_14 = input.LA(1);
+
+                         
+                        int index35_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_14==DOUBLE_QUOTE) && ((strict == false))) {s = 43;}
+
+                         
+                        input.seek(index35_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA35_26 = input.LA(1);
+
+                         
+                        int index35_26 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_26==DOUBLE_QUOTE) && ((strict == false))) {s = 55;}
+
+                         
+                        input.seek(index35_26);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA35_16 = input.LA(1);
+
+                         
+                        int index35_16 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_16==DOUBLE_QUOTE) && ((strict == false))) {s = 45;}
+
+                         
+                        input.seek(index35_16);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA35_27 = input.LA(1);
+
+                         
+                        int index35_27 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_27==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
+
+                         
+                        input.seek(index35_27);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA35_32 = input.LA(1);
+
+                         
+                        int index35_32 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_32==DOUBLE_QUOTE) && ((strict == false))) {s = 61;}
+
+                         
+                        input.seek(index35_32);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA35_0 = input.LA(1);
+
+                         
+                        int index35_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_0==ID) ) {s = 1;}
+
+                        else if ( (LA35_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
+
+                         
+                        input.seek(index35_0);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA35_12 = input.LA(1);
+
+                         
+                        int index35_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_12==DOUBLE_QUOTE) && ((strict == false))) {s = 41;}
+
+                         
+                        input.seek(index35_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA35_22 = input.LA(1);
+
+                         
+                        int index35_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_22==DOUBLE_QUOTE) && ((strict == false))) {s = 51;}
+
+                         
+                        input.seek(index35_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA35_62 = input.LA(1);
+
+                         
+                        int index35_62 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_62);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA35_61 = input.LA(1);
+
+                         
+                        int index35_61 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_61);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA35_60 = input.LA(1);
+
+                         
+                        int index35_60 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_60);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 32 : 
+                        int LA35_59 = input.LA(1);
+
+                         
+                        int index35_59 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_59);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 33 : 
+                        int LA35_58 = input.LA(1);
+
+                         
+                        int index35_58 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_58);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 34 : 
+                        int LA35_57 = input.LA(1);
+
+                         
+                        int index35_57 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_57);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 35 : 
+                        int LA35_56 = input.LA(1);
+
+                         
+                        int index35_56 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_56);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 36 : 
+                        int LA35_55 = input.LA(1);
+
+                         
+                        int index35_55 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_55);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 37 : 
+                        int LA35_54 = input.LA(1);
+
+                         
+                        int index35_54 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_54);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 38 : 
+                        int LA35_53 = input.LA(1);
+
+                         
+                        int index35_53 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_53);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 39 : 
+                        int LA35_52 = input.LA(1);
+
+                         
+                        int index35_52 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_52);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 40 : 
+                        int LA35_51 = input.LA(1);
+
+                         
+                        int index35_51 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_51);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 41 : 
+                        int LA35_50 = input.LA(1);
+
+                         
+                        int index35_50 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_50);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 42 : 
+                        int LA35_49 = input.LA(1);
+
+                         
+                        int index35_49 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_49);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 43 : 
+                        int LA35_23 = input.LA(1);
+
+                         
+                        int index35_23 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_23==DOUBLE_QUOTE) && ((strict == false))) {s = 52;}
+
+                         
+                        input.seek(index35_23);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 44 : 
+                        int LA35_34 = input.LA(1);
+
+                         
+                        int index35_34 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_34);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 45 : 
+                        int LA35_35 = input.LA(1);
+
+                         
+                        int index35_35 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_35);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 46 : 
+                        int LA35_36 = input.LA(1);
+
+                         
+                        int index35_36 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_36);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 47 : 
+                        int LA35_37 = input.LA(1);
+
+                         
+                        int index35_37 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_37);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 48 : 
+                        int LA35_38 = input.LA(1);
+
+                         
+                        int index35_38 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_38);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 49 : 
+                        int LA35_39 = input.LA(1);
+
+                         
+                        int index35_39 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_39);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 50 : 
+                        int LA35_40 = input.LA(1);
+
+                         
+                        int index35_40 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_40);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 51 : 
+                        int LA35_41 = input.LA(1);
+
+                         
+                        int index35_41 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_41);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 52 : 
+                        int LA35_42 = input.LA(1);
+
+                         
+                        int index35_42 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_42);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 53 : 
+                        int LA35_43 = input.LA(1);
+
+                         
+                        int index35_43 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_43);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 54 : 
+                        int LA35_44 = input.LA(1);
+
+                         
+                        int index35_44 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_44);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 55 : 
+                        int LA35_45 = input.LA(1);
+
+                         
+                        int index35_45 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_45);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 56 : 
+                        int LA35_46 = input.LA(1);
+
+                         
+                        int index35_46 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_46);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 57 : 
+                        int LA35_47 = input.LA(1);
+
+                         
+                        int index35_47 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_47);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 58 : 
+                        int LA35_48 = input.LA(1);
+
+                         
+                        int index35_48 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (((synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false))||(synpred4_CMIS()&&(strict == false)))) ) {s = 3;}
+
+                        else if ( ((strict == false)) ) {s = 4;}
+
+                         
+                        input.seek(index35_48);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 59 : 
+                        int LA35_13 = input.LA(1);
+
+                         
+                        int index35_13 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_13==DOUBLE_QUOTE) && ((strict == false))) {s = 42;}
+
+                         
+                        input.seek(index35_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 60 : 
+                        int LA35_24 = input.LA(1);
+
+                         
+                        int index35_24 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA35_24==DOUBLE_QUOTE) && ((strict == false))) {s = 53;}
+
+                         
+                        input.seek(index35_24);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 41, _s, input);
+                new NoViableAltException(getDescription(), 35, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String DFA43_eotS =
+        "\153\uffff";
+    static final String DFA43_eofS =
+        "\1\uffff\1\4\41\uffff\1\4\1\uffff\1\103\40\uffff\1\111\1\114\42"+
+        "\uffff\1\114";
+    static final String DFA43_minS =
+        "\1\105\1\41\1\37\2\uffff\1\105\35\106\1\41\1\37\1\41\35\106\1\uffff"+
+        "\1\105\1\uffff\2\41\1\37\4\uffff\35\106\1\41";
+    static final String DFA43_maxS =
+        "\1\106\1\102\1\114\2\uffff\36\106\1\102\1\114\1\102\35\106\1\uffff"+
+        "\1\106\1\uffff\2\102\1\114\4\uffff\35\106\1\102";
+    static final String DFA43_acceptS =
+        "\3\uffff\1\2\1\1\76\uffff\1\1\1\uffff\1\2\3\uffff\1\1\2\2\1\1\36"+
+        "\uffff";
+    static final String DFA43_specialS =
+        "\1\74\1\uffff\1\40\3\uffff\1\50\1\43\1\45\1\41\1\37\1\30\1\35\1"+
+        "\23\1\25\1\17\1\14\1\20\1\6\1\12\1\10\1\0\1\1\1\67\1\71\1\77\1\47"+
+        "\1\57\1\61\1\42\1\44\1\27\1\34\1\63\1\53\2\uffff\1\51\36\uffff\1"+
+        "\22\2\uffff\1\21\1\15\4\uffff\1\7\1\11\1\13\1\2\1\3\1\4\1\5\1\55"+
+        "\1\54\1\52\1\46\1\64\1\62\1\60\1\56\1\72\1\70\1\66\1\65\1\100\1"+
+        "\76\1\75\1\73\1\32\1\33\1\26\1\31\1\24\1\36\1\16}>";
+    static final String[] DFA43_transitionS = {
+            "\1\1\1\2",
+            "\1\4\2\uffff\1\5\34\uffff\2\3",
+            "\1\6\2\uffff\1\7\4\uffff\1\10\1\11\1\12\1\13\1\14\1\15\1\uffff"+
+            "\1\16\1\17\1\20\1\21\5\uffff\1\22\1\23\1\24\1\25\1\26\1\27\1"+
+            "\30\1\31\1\32\1\33\1\34\1\35\2\uffff\1\42\3\uffff\1\37\1\40"+
+            "\1\36\1\41",
+            "",
+            "",
+            "\1\43\1\44",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\45",
+            "\1\4\37\uffff\2\3",
+            "\1\46\2\uffff\1\47\4\uffff\1\50\1\51\1\52\1\53\1\54\1\55\1"+
+            "\uffff\1\56\1\57\1\60\1\61\5\uffff\1\62\1\63\1\64\1\65\1\66"+
+            "\1\67\1\70\1\71\1\72\1\73\1\74\1\75\2\uffff\1\102\3\uffff\1"+
+            "\77\1\100\1\76\1\101",
+            "\1\103\2\uffff\1\104\34\uffff\2\105",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "\1\106",
+            "",
+            "\1\107\1\110",
+            "",
+            "\1\4\37\uffff\1\3\1\112",
+            "\1\103\37\uffff\1\105\1\113",
+            "\1\115\2\uffff\1\116\4\uffff\1\117\1\120\1\121\1\122\1\123"+
+            "\1\124\1\uffff\1\125\1\126\1\127\1\130\5\uffff\1\131\1\132\1"+
+            "\133\1\134\1\135\1\136\1\137\1\140\1\141\1\142\1\143\1\144\2"+
+            "\uffff\1\151\3\uffff\1\146\1\147\1\145\1\150",
+            "",
+            "",
+            "",
+            "",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\152",
+            "\1\103\37\uffff\1\105\1\113"
+    };
+
+    static final short[] DFA43_eot = DFA.unpackEncodedString(DFA43_eotS);
+    static final short[] DFA43_eof = DFA.unpackEncodedString(DFA43_eofS);
+    static final char[] DFA43_min = DFA.unpackEncodedStringToUnsignedChars(DFA43_minS);
+    static final char[] DFA43_max = DFA.unpackEncodedStringToUnsignedChars(DFA43_maxS);
+    static final short[] DFA43_accept = DFA.unpackEncodedString(DFA43_acceptS);
+    static final short[] DFA43_special = DFA.unpackEncodedString(DFA43_specialS);
+    static final short[][] DFA43_transition;
+
+    static {
+        int numStates = DFA43_transitionS.length;
+        DFA43_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA43_transition[i] = DFA.unpackEncodedString(DFA43_transitionS[i]);
+        }
+    }
+
+    class DFA43 extends DFA {
+
+        public DFA43(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 43;
+            this.eot = DFA43_eot;
+            this.eof = DFA43_eof;
+            this.min = DFA43_min;
+            this.max = DFA43_max;
+            this.accept = DFA43_accept;
+            this.special = DFA43_special;
+            this.transition = DFA43_transition;
+        }
+        public String getDescription() {
+            return "557:1: sortSpecification : ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) );";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA43_21 = input.LA(1);
+
+                         
+                        int index43_21 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_21==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_21);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA43_22 = input.LA(1);
+
+                         
+                        int index43_22 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_22==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_22);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA43_80 = input.LA(1);
+
+                         
+                        int index43_80 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_80==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_80);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA43_81 = input.LA(1);
+
+                         
+                        int index43_81 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_81==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_81);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA43_82 = input.LA(1);
+
+                         
+                        int index43_82 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_82==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_82);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA43_83 = input.LA(1);
+
+                         
+                        int index43_83 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_83==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_83);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA43_18 = input.LA(1);
+
+                         
+                        int index43_18 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_18==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_18);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA43_77 = input.LA(1);
+
+                         
+                        int index43_77 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_77==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_77);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA43_20 = input.LA(1);
+
+                         
+                        int index43_20 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_20==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_20);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA43_78 = input.LA(1);
+
+                         
+                        int index43_78 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_78==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_78);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA43_19 = input.LA(1);
+
+                         
+                        int index43_19 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_19==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_19);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 11 : 
+                        int LA43_79 = input.LA(1);
+
+                         
+                        int index43_79 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_79==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_79);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA43_16 = input.LA(1);
+
+                         
+                        int index43_16 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_16==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_16);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 13 : 
+                        int LA43_72 = input.LA(1);
+
+                         
+                        int index43_72 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_72==SELECT) && ((strict == false))) {s = 77;}
+
+                        else if ( (LA43_72==AS) && ((strict == false))) {s = 78;}
+
+                        else if ( (LA43_72==FROM) && ((strict == false))) {s = 79;}
+
+                        else if ( (LA43_72==JOIN) && ((strict == false))) {s = 80;}
+
+                        else if ( (LA43_72==INNER) && ((strict == false))) {s = 81;}
+
+                        else if ( (LA43_72==LEFT) && ((strict == false))) {s = 82;}
+
+                        else if ( (LA43_72==OUTER) && ((strict == false))) {s = 83;}
+
+                        else if ( (LA43_72==ON) && ((strict == false))) {s = 84;}
+
+                        else if ( (LA43_72==WHERE) && ((strict == false))) {s = 85;}
+
+                        else if ( (LA43_72==OR) && ((strict == false))) {s = 86;}
+
+                        else if ( (LA43_72==AND) && ((strict == false))) {s = 87;}
+
+                        else if ( (LA43_72==NOT) && ((strict == false))) {s = 88;}
+
+                        else if ( (LA43_72==IN) && ((strict == false))) {s = 89;}
+
+                        else if ( (LA43_72==LIKE) && ((strict == false))) {s = 90;}
+
+                        else if ( (LA43_72==IS) && ((strict == false))) {s = 91;}
+
+                        else if ( (LA43_72==NULL) && ((strict == false))) {s = 92;}
+
+                        else if ( (LA43_72==ANY) && ((strict == false))) {s = 93;}
+
+                        else if ( (LA43_72==CONTAINS) && ((strict == false))) {s = 94;}
+
+                        else if ( (LA43_72==IN_FOLDER) && ((strict == false))) {s = 95;}
+
+                        else if ( (LA43_72==IN_TREE) && ((strict == false))) {s = 96;}
+
+                        else if ( (LA43_72==ORDER) && ((strict == false))) {s = 97;}
+
+                        else if ( (LA43_72==BY) && ((strict == false))) {s = 98;}
+
+                        else if ( (LA43_72==ASC) && ((strict == false))) {s = 99;}
+
+                        else if ( (LA43_72==DESC) && ((strict == false))) {s = 100;}
+
+                        else if ( (LA43_72==TIMESTAMP) && ((strict == false))) {s = 101;}
+
+                        else if ( (LA43_72==TRUE) && ((strict == false))) {s = 102;}
+
+                        else if ( (LA43_72==FALSE) && ((strict == false))) {s = 103;}
+
+                        else if ( (LA43_72==SCORE) && ((strict == false))) {s = 104;}
+
+                        else if ( (LA43_72==ID) && ((strict == false))) {s = 105;}
+
+                         
+                        input.seek(index43_72);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 14 : 
+                        int LA43_106 = input.LA(1);
+
+                         
+                        int index43_106 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_106==COMMA) && ((strict == false))) {s = 67;}
+
+                        else if ( (LA43_106==EOF) && ((strict == false))) {s = 76;}
+
+                        else if ( (LA43_106==ASC) && ((strict == false))) {s = 69;}
+
+                        else if ( (LA43_106==DESC) && ((strict == false))) {s = 75;}
+
+                         
+                        input.seek(index43_106);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 15 : 
+                        int LA43_15 = input.LA(1);
+
+                         
+                        int index43_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_15==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_15);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 16 : 
+                        int LA43_17 = input.LA(1);
+
+                         
+                        int index43_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_17==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 17 : 
+                        int LA43_71 = input.LA(1);
+
+                         
+                        int index43_71 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_71==ASC) && ((strict == false))) {s = 69;}
+
+                        else if ( (LA43_71==DESC) && ((strict == false))) {s = 75;}
+
+                        else if ( (LA43_71==COMMA) && ((strict == false))) {s = 67;}
+
+                        else if ( (LA43_71==EOF) && ((strict == false))) {s = 76;}
+
+                         
+                        input.seek(index43_71);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 18 : 
+                        int LA43_68 = input.LA(1);
+
+                         
+                        int index43_68 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_68==ID) && ((strict == false))) {s = 71;}
+
+                        else if ( (LA43_68==DOUBLE_QUOTE) && ((strict == false))) {s = 72;}
+
+                         
+                        input.seek(index43_68);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 19 : 
+                        int LA43_13 = input.LA(1);
+
+                         
+                        int index43_13 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_13==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_13);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 20 : 
+                        int LA43_104 = input.LA(1);
+
+                         
+                        int index43_104 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_104==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_104);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 21 : 
+                        int LA43_14 = input.LA(1);
+
+                         
+                        int index43_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_14==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 22 : 
+                        int LA43_102 = input.LA(1);
+
+                         
+                        int index43_102 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_102==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_102);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 23 : 
+                        int LA43_31 = input.LA(1);
+
+                         
+                        int index43_31 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_31==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_31);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 24 : 
+                        int LA43_11 = input.LA(1);
+
+                         
+                        int index43_11 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_11==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_11);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 25 : 
+                        int LA43_103 = input.LA(1);
+
+                         
+                        int index43_103 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_103==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_103);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 26 : 
+                        int LA43_100 = input.LA(1);
+
+                         
+                        int index43_100 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_100==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_100);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 27 : 
+                        int LA43_101 = input.LA(1);
+
+                         
+                        int index43_101 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_101==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_101);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 28 : 
+                        int LA43_32 = input.LA(1);
+
+                         
+                        int index43_32 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_32==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_32);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 29 : 
+                        int LA43_12 = input.LA(1);
+
+                         
+                        int index43_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_12==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 30 : 
+                        int LA43_105 = input.LA(1);
+
+                         
+                        int index43_105 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_105==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_105);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 31 : 
+                        int LA43_10 = input.LA(1);
+
+                         
+                        int index43_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_10==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 32 : 
+                        int LA43_2 = input.LA(1);
+
+                         
+                        int index43_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_2==SELECT) && ((strict == false))) {s = 6;}
+
+                        else if ( (LA43_2==AS) && ((strict == false))) {s = 7;}
+
+                        else if ( (LA43_2==FROM) && ((strict == false))) {s = 8;}
+
+                        else if ( (LA43_2==JOIN) && ((strict == false))) {s = 9;}
+
+                        else if ( (LA43_2==INNER) && ((strict == false))) {s = 10;}
+
+                        else if ( (LA43_2==LEFT) && ((strict == false))) {s = 11;}
+
+                        else if ( (LA43_2==OUTER) && ((strict == false))) {s = 12;}
+
+                        else if ( (LA43_2==ON) && ((strict == false))) {s = 13;}
+
+                        else if ( (LA43_2==WHERE) && ((strict == false))) {s = 14;}
+
+                        else if ( (LA43_2==OR) && ((strict == false))) {s = 15;}
+
+                        else if ( (LA43_2==AND) && ((strict == false))) {s = 16;}
+
+                        else if ( (LA43_2==NOT) && ((strict == false))) {s = 17;}
+
+                        else if ( (LA43_2==IN) && ((strict == false))) {s = 18;}
+
+                        else if ( (LA43_2==LIKE) && ((strict == false))) {s = 19;}
+
+                        else if ( (LA43_2==IS) && ((strict == false))) {s = 20;}
+
+                        else if ( (LA43_2==NULL) && ((strict == false))) {s = 21;}
+
+                        else if ( (LA43_2==ANY) && ((strict == false))) {s = 22;}
+
+                        else if ( (LA43_2==CONTAINS) && ((strict == false))) {s = 23;}
+
+                        else if ( (LA43_2==IN_FOLDER) && ((strict == false))) {s = 24;}
+
+                        else if ( (LA43_2==IN_TREE) && ((strict == false))) {s = 25;}
+
+                        else if ( (LA43_2==ORDER) && ((strict == false))) {s = 26;}
+
+                        else if ( (LA43_2==BY) && ((strict == false))) {s = 27;}
+
+                        else if ( (LA43_2==ASC) && ((strict == false))) {s = 28;}
+
+                        else if ( (LA43_2==DESC) && ((strict == false))) {s = 29;}
+
+                        else if ( (LA43_2==TIMESTAMP) && ((strict == false))) {s = 30;}
+
+                        else if ( (LA43_2==TRUE) && ((strict == false))) {s = 31;}
+
+                        else if ( (LA43_2==FALSE) && ((strict == false))) {s = 32;}
+
+                        else if ( (LA43_2==SCORE) && ((strict == false))) {s = 33;}
+
+                        else if ( (LA43_2==ID) && ((strict == false))) {s = 34;}
+
+                         
+                        input.seek(index43_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 33 : 
+                        int LA43_9 = input.LA(1);
+
+                         
+                        int index43_9 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_9==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_9);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 34 : 
+                        int LA43_29 = input.LA(1);
+
+                         
+                        int index43_29 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_29==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_29);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 35 : 
+                        int LA43_7 = input.LA(1);
+
+                         
+                        int index43_7 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_7==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_7);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 36 : 
+                        int LA43_30 = input.LA(1);
+
+                         
+                        int index43_30 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_30==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_30);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 37 : 
+                        int LA43_8 = input.LA(1);
+
+                         
+                        int index43_8 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_8==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_8);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 38 : 
+                        int LA43_87 = input.LA(1);
+
+                         
+                        int index43_87 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_87==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_87);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 39 : 
+                        int LA43_26 = input.LA(1);
+
+                         
+                        int index43_26 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_26==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_26);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 40 : 
+                        int LA43_6 = input.LA(1);
+
+                         
+                        int index43_6 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_6==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_6);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 41 : 
+                        int LA43_37 = input.LA(1);
+
+                         
+                        int index43_37 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_37==EOF||LA43_37==COMMA) && ((strict == false))) {s = 67;}
+
+                        else if ( (LA43_37==DOT) && ((strict == false))) {s = 68;}
+
+                        else if ( ((LA43_37>=ASC && LA43_37<=DESC)) && ((strict == false))) {s = 69;}
+
+                         
+                        input.seek(index43_37);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 42 : 
+                        int LA43_86 = input.LA(1);
+
+                         
+                        int index43_86 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_86==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_86);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 43 : 
+                        int LA43_34 = input.LA(1);
+
+                         
+                        int index43_34 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_34==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_34);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 44 : 
+                        int LA43_85 = input.LA(1);
+
+                         
+                        int index43_85 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_85==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_85);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 45 : 
+                        int LA43_84 = input.LA(1);
+
+                         
+                        int index43_84 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_84==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_84);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 46 : 
+                        int LA43_91 = input.LA(1);
+
+                         
+                        int index43_91 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_91==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_91);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 47 : 
+                        int LA43_27 = input.LA(1);
+
+                         
+                        int index43_27 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_27==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_27);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 48 : 
+                        int LA43_90 = input.LA(1);
+
+                         
+                        int index43_90 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_90==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_90);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 49 : 
+                        int LA43_28 = input.LA(1);
+
+                         
+                        int index43_28 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_28==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_28);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 50 : 
+                        int LA43_89 = input.LA(1);
+
+                         
+                        int index43_89 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_89==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_89);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 51 : 
+                        int LA43_33 = input.LA(1);
+
+                         
+                        int index43_33 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_33==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_33);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 52 : 
+                        int LA43_88 = input.LA(1);
+
+                         
+                        int index43_88 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_88==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_88);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 53 : 
+                        int LA43_95 = input.LA(1);
+
+                         
+                        int index43_95 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_95==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_95);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 54 : 
+                        int LA43_94 = input.LA(1);
+
+                         
+                        int index43_94 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_94==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_94);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 55 : 
+                        int LA43_23 = input.LA(1);
+
+                         
+                        int index43_23 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_23==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_23);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 56 : 
+                        int LA43_93 = input.LA(1);
+
+                         
+                        int index43_93 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_93==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_93);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 57 : 
+                        int LA43_24 = input.LA(1);
+
+                         
+                        int index43_24 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_24==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_24);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 58 : 
+                        int LA43_92 = input.LA(1);
+
+                         
+                        int index43_92 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_92==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_92);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 59 : 
+                        int LA43_99 = input.LA(1);
+
+                         
+                        int index43_99 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_99==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_99);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 60 : 
+                        int LA43_0 = input.LA(1);
+
+                         
+                        int index43_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_0==ID) ) {s = 1;}
+
+                        else if ( (LA43_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
+
+                         
+                        input.seek(index43_0);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 61 : 
+                        int LA43_98 = input.LA(1);
+
+                         
+                        int index43_98 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_98==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_98);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 62 : 
+                        int LA43_97 = input.LA(1);
+
+                         
+                        int index43_97 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_97==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_97);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 63 : 
+                        int LA43_25 = input.LA(1);
+
+                         
+                        int index43_25 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_25==DOUBLE_QUOTE) && ((strict == false))) {s = 37;}
+
+                         
+                        input.seek(index43_25);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 64 : 
+                        int LA43_96 = input.LA(1);
+
+                         
+                        int index43_96 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA43_96==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
+
+                         
+                        input.seek(index43_96);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 43, _s, input);
             error(nvae);
             throw nvae;
         }
     }
  
 
-    public static final BitSet FOLLOW_SELECT_in_query180 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000000E67L});
-    public static final BitSet FOLLOW_selectList_in_query182 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_fromClause_in_query184 = new BitSet(new long[]{0x8000400000000000L});
-    public static final BitSet FOLLOW_whereClause_in_query186 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_orderByClause_in_query189 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_query192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STAR_in_selectList241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_selectSubList_in_selectList257 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_COMMA_in_selectList261 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000000E67L});
-    public static final BitSet FOLLOW_selectSubList_in_selectList263 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_valueExpression_in_selectSubList299 = new BitSet(new long[]{0x0000000400000002L,0x0000000000000060L});
-    public static final BitSet FOLLOW_AS_in_selectSubList303 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_columnName_in_selectSubList306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualifier_in_selectSubList327 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_DOTSTAR_in_selectSubList329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_multiValuedColumnReference_in_selectSubList345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_valueExpression364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_valueFunction_in_valueExpression377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualifier_in_columnReference400 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_DOT_in_columnReference402 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_columnName_in_columnReference407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualifier_in_multiValuedColumnReference443 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_DOT_in_multiValuedColumnReference445 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000000E67L});
-    public static final BitSet FOLLOW_multiValuedColumnName_in_multiValuedColumnReference451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_keyWordOrId_in_valueFunction478 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_valueFunction480 = new BitSet(new long[]{0x0000004000000000L,0x0000000000000FF8L});
-    public static final BitSet FOLLOW_functionArgument_in_valueFunction482 = new BitSet(new long[]{0x0000004000000000L,0x0000000000000FF8L});
-    public static final BitSet FOLLOW_RPAREN_in_valueFunction485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualifier_in_functionArgument520 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_DOT_in_functionArgument522 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_columnName_in_functionArgument524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_functionArgument548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_functionArgument558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_tableName_in_qualifier579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_correlationName_in_qualifier591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FROM_in_fromClause628 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_tableReference_in_fromClause630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_singleTable_in_tableReference648 = new BitSet(new long[]{0x0000070000000002L});
-    public static final BitSet FOLLOW_joinedTable_in_tableReference657 = new BitSet(new long[]{0x0000070000000002L});
-    public static final BitSet FOLLOW_tableName_in_singleTable686 = new BitSet(new long[]{0x0000000400000002L,0x0000000000000060L});
-    public static final BitSet FOLLOW_AS_in_singleTable690 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_correlationName_in_singleTable693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_singleTable714 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_joinedTables_in_singleTable716 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_singleTable718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_joinType_in_joinedTable740 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_JOIN_in_joinedTable743 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_tableReference_in_joinedTable745 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_joinSpecification_in_joinedTable753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_singleTable_in_joinedTables781 = new BitSet(new long[]{0x0000070000000000L});
-    public static final BitSet FOLLOW_joinedTable_in_joinedTables783 = new BitSet(new long[]{0x0000070000000002L});
-    public static final BitSet FOLLOW_INNER_in_joinType810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_in_joinType822 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_OUTER_in_joinType824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ON_in_joinSpecification844 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_columnReference_in_joinSpecification848 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_EQUALS_in_joinSpecification850 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_columnReference_in_joinSpecification854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_WHERE_in_whereClause905 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000000FFFL});
-    public static final BitSet FOLLOW_searchOrCondition_in_whereClause907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_searchAndCondition_in_searchOrCondition927 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_OR_in_searchOrCondition930 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000000FFFL});
-    public static final BitSet FOLLOW_searchAndCondition_in_searchOrCondition932 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_searchNotCondition_in_searchAndCondition960 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_AND_in_searchAndCondition963 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000000FFFL});
-    public static final BitSet FOLLOW_searchNotCondition_in_searchAndCondition965 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_NOT_in_searchNotCondition992 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000000FFFL});
-    public static final BitSet FOLLOW_searchTest_in_searchNotCondition994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_searchTest_in_searchNotCondition1009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_predicate_in_searchTest1027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_searchTest1038 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000000FFFL});
-    public static final BitSet FOLLOW_searchOrCondition_in_searchTest1040 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_searchTest1042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_comparisonPredicate_in_predicate1059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_inPredicate_in_predicate1064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_likePredicate_in_predicate1069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_nullPredicate_in_predicate1074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_quantifiedComparisonPredicate_in_predicate1085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_quantifiedInPredicate_in_predicate1090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_textSearchPredicate_in_predicate1095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_folderPredicate_in_predicate1100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_valueExpression_in_comparisonPredicate1112 = new BitSet(new long[]{0x007C200000000000L});
-    public static final BitSet FOLLOW_compOp_in_comparisonPredicate1114 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000FF8L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_comparisonPredicate1116 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SELECT_in_query217 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000001E67L});
+    public static final BitSet FOLLOW_selectList_in_query219 = new BitSet(new long[]{0x0000008000000000L});
+    public static final BitSet FOLLOW_fromClause_in_query221 = new BitSet(new long[]{0x8000400000000000L});
+    public static final BitSet FOLLOW_whereClause_in_query223 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_orderByClause_in_query226 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_query229 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STAR_in_selectList286 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_selectSubList_in_selectList302 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_COMMA_in_selectList306 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000001E67L});
+    public static final BitSet FOLLOW_selectSubList_in_selectList308 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_valueExpression_in_selectSubList344 = new BitSet(new long[]{0x0000000400000002L,0x0000000000000060L});
+    public static final BitSet FOLLOW_AS_in_selectSubList348 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_columnName_in_selectSubList351 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_qualifier_in_selectSubList372 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_DOTSTAR_in_selectSubList374 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_multiValuedColumnReference_in_selectSubList390 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_valueExpression435 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_valueFunction_in_valueExpression448 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_qualifier_in_columnReference497 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_DOT_in_columnReference499 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_columnName_in_columnReference504 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_qualifier_in_multiValuedColumnReference566 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_DOT_in_multiValuedColumnReference568 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000001E67L});
+    public static final BitSet FOLLOW_multiValuedColumnName_in_multiValuedColumnReference574 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_cmisFunction_in_valueFunction640 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_LPAREN_in_valueFunction642 = new BitSet(new long[]{0x0000004000000000L,0x0000000000000FF8L});
+    public static final BitSet FOLLOW_functionArgument_in_valueFunction644 = new BitSet(new long[]{0x0000004000000000L,0x0000000000000FF8L});
+    public static final BitSet FOLLOW_RPAREN_in_valueFunction647 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_keyWordOrId_in_valueFunction675 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_LPAREN_in_valueFunction677 = new BitSet(new long[]{0x0000004000000000L,0x0000000000000FF8L});
+    public static final BitSet FOLLOW_functionArgument_in_valueFunction679 = new BitSet(new long[]{0x0000004000000000L,0x0000000000000FF8L});
+    public static final BitSet FOLLOW_RPAREN_in_valueFunction682 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_qualifier_in_functionArgument717 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_DOT_in_functionArgument719 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_columnName_in_functionArgument721 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_functionArgument745 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literalOrParameterName_in_functionArgument755 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_tableName_in_qualifier776 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_correlationName_in_qualifier788 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FROM_in_fromClause833 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_tableReference_in_fromClause835 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_singleTable_in_tableReference856 = new BitSet(new long[]{0x0000070000000002L});
+    public static final BitSet FOLLOW_joinedTable_in_tableReference858 = new BitSet(new long[]{0x0000070000000002L});
+    public static final BitSet FOLLOW_tableName_in_singleTable886 = new BitSet(new long[]{0x0000000400000002L,0x0000000000000060L});
+    public static final BitSet FOLLOW_AS_in_singleTable890 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_correlationName_in_singleTable893 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_singleTable914 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_joinedTables_in_singleTable916 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_RPAREN_in_singleTable918 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_joinType_in_joinedTable966 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_JOIN_in_joinedTable969 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_tableReference_in_joinedTable971 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_joinSpecification_in_joinedTable973 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_singleTable_in_joinedTables1001 = new BitSet(new long[]{0x0000070000000000L});
+    public static final BitSet FOLLOW_joinedTable_in_joinedTables1003 = new BitSet(new long[]{0x0000070000000002L});
+    public static final BitSet FOLLOW_INNER_in_joinType1030 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_in_joinType1042 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_OUTER_in_joinType1044 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ON_in_joinSpecification1090 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_columnReference_in_joinSpecification1094 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_EQUALS_in_joinSpecification1096 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_columnReference_in_joinSpecification1100 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_WHERE_in_whereClause1159 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000001FFFL});
+    public static final BitSet FOLLOW_searchOrCondition_in_whereClause1161 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_searchAndCondition_in_searchOrCondition1181 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_OR_in_searchOrCondition1184 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000001FFFL});
+    public static final BitSet FOLLOW_searchAndCondition_in_searchOrCondition1186 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_searchNotCondition_in_searchAndCondition1214 = new BitSet(new long[]{0x0001000000000002L});
+    public static final BitSet FOLLOW_AND_in_searchAndCondition1217 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000001FFFL});
+    public static final BitSet FOLLOW_searchNotCondition_in_searchAndCondition1219 = new BitSet(new long[]{0x0001000000000002L});
+    public static final BitSet FOLLOW_NOT_in_searchNotCondition1246 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000001FFFL});
+    public static final BitSet FOLLOW_searchTest_in_searchNotCondition1248 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_searchTest_in_searchNotCondition1263 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_predicate_in_searchTest1281 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_searchTest1292 = new BitSet(new long[]{0xFF83DFA580000000L,0x0000000000001FFFL});
+    public static final BitSet FOLLOW_searchOrCondition_in_searchTest1294 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_RPAREN_in_searchTest1296 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_comparisonPredicate_in_predicate1313 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_inPredicate_in_predicate1318 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_likePredicate_in_predicate1323 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_nullPredicate_in_predicate1328 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_quantifiedComparisonPredicate_in_predicate1339 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_quantifiedInPredicate_in_predicate1344 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_textSearchPredicate_in_predicate1349 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_folderPredicate_in_predicate1354 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_valueExpression_in_comparisonPredicate1366 = new BitSet(new long[]{0x007C200000000000L});
+    public static final BitSet FOLLOW_compOp_in_comparisonPredicate1368 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000FF8L});
+    public static final BitSet FOLLOW_literalOrParameterName_in_comparisonPredicate1370 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_set_in_compOp0 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_in_literalOrParameterName1182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_parameterName_in_literalOrParameterName1190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_signedNumericLiteral_in_literal1203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_characterStringLiteral_in_literal1208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_booleanLiteral_in_literal1213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_datetimeLiteral_in_literal1218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_inPredicate1230 = new BitSet(new long[]{0x0082000000000000L});
-    public static final BitSet FOLLOW_NOT_in_inPredicate1232 = new BitSet(new long[]{0x0080000000000000L});
-    public static final BitSet FOLLOW_IN_in_inPredicate1235 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_inPredicate1237 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000FF8L});
-    public static final BitSet FOLLOW_inValueList_in_inPredicate1239 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_inPredicate1241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_inValueList1270 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_COMMA_in_inValueList1273 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000FF8L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_inValueList1275 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_columnReference_in_likePredicate1301 = new BitSet(new long[]{0x0102000000000000L});
-    public static final BitSet FOLLOW_NOT_in_likePredicate1303 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_LIKE_in_likePredicate1306 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_characterStringLiteral_in_likePredicate1308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_nullPredicate1342 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_multiValuedColumnReference_in_nullPredicate1346 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_IS_in_nullPredicate1349 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_NULL_in_nullPredicate1351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_nullPredicate1380 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_multiValuedColumnReference_in_nullPredicate1384 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_IS_in_nullPredicate1387 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_NOT_in_nullPredicate1389 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_NULL_in_nullPredicate1391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_quantifiedComparisonPredicate1419 = new BitSet(new long[]{0x007C200000000000L});
-    public static final BitSet FOLLOW_compOp_in_quantifiedComparisonPredicate1421 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_ANY_in_quantifiedComparisonPredicate1423 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000000E67L});
-    public static final BitSet FOLLOW_multiValuedColumnReference_in_quantifiedComparisonPredicate1425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ANY_in_quantifiedInPredicate1454 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000000E67L});
-    public static final BitSet FOLLOW_multiValuedColumnReference_in_quantifiedInPredicate1456 = new BitSet(new long[]{0x0082000000000000L});
-    public static final BitSet FOLLOW_NOT_in_quantifiedInPredicate1458 = new BitSet(new long[]{0x0080000000000000L});
-    public static final BitSet FOLLOW_IN_in_quantifiedInPredicate1461 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_quantifiedInPredicate1464 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000FF8L});
-    public static final BitSet FOLLOW_inValueList_in_quantifiedInPredicate1466 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_quantifiedInPredicate1468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_CONTAINS_in_textSearchPredicate1497 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_textSearchPredicate1499 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000070L});
-    public static final BitSet FOLLOW_qualifier_in_textSearchPredicate1502 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_COMMA_in_textSearchPredicate1504 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000070L});
-    public static final BitSet FOLLOW_textSearchExpression_in_textSearchPredicate1508 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_textSearchPredicate1510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_FOLDER_in_folderPredicate1535 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_folderPredicateArgs_in_folderPredicate1538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_TREE_in_folderPredicate1559 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_folderPredicateArgs_in_folderPredicate1561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_folderPredicateArgs1583 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000070L});
-    public static final BitSet FOLLOW_qualifier_in_folderPredicateArgs1586 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_COMMA_in_folderPredicateArgs1588 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000070L});
-    public static final BitSet FOLLOW_folderId_in_folderPredicateArgs1592 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_folderPredicateArgs1594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ORDER_in_orderByClause1633 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_BY_in_orderByClause1635 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_sortSpecification_in_orderByClause1637 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_COMMA_in_orderByClause1641 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_sortSpecification_in_orderByClause1643 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_columnReference_in_sortSpecification1669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_sortSpecification1687 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000006L});
-    public static final BitSet FOLLOW_ASC_in_sortSpecification1693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DESC_in_sortSpecification1699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_correlationName1726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_tableName1740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_columnName1758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_multiValuedColumnName1777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLON_in_parameterName1795 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_identifier_in_parameterName1797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_characterStringLiteral_in_folderId1820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUOTED_STRING_in_textSearchExpression1841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_identifier1853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_QUOTE_in_identifier1868 = new BitSet(new long[]{0xFF83DF8480000000L,0x0000000000000E67L});
-    public static final BitSet FOLLOW_keyWordOrId_in_identifier1870 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_DOUBLE_QUOTE_in_identifier1872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOATING_POINT_LITERAL_in_signedNumericLiteral1892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_integerLiteral_in_signedNumericLiteral1907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DECIMAL_INTEGER_LITERAL_in_integerLiteral1926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TRUE_in_booleanLiteral1950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FALSE_in_booleanLiteral1968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TIMESTAMP_in_datetimeLiteral1993 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_QUOTED_STRING_in_datetimeLiteral1995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUOTED_STRING_in_characterStringLiteral2018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_keyWord0 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_keyWord_in_keyWordOrId2208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_keyWordOrId2220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_valueExpression_in_synpred1_CMIS295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_tableName_in_synpred2_CMIS574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_joinedTable_in_synpred3_CMIS652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_synpred5_CMIS1338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_synpred6_CMIS1376 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_in_literalOrParameterName1436 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_parameterName_in_literalOrParameterName1444 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_signedNumericLiteral_in_literal1457 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_characterStringLiteral_in_literal1462 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_booleanLiteral_in_literal1467 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_datetimeLiteral_in_literal1472 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_inPredicate1484 = new BitSet(new long[]{0x0082000000000000L});
+    public static final BitSet FOLLOW_NOT_in_inPredicate1486 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_IN_in_inPredicate1489 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_LPAREN_in_inPredicate1491 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000FF8L});
+    public static final BitSet FOLLOW_inValueList_in_inPredicate1493 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_RPAREN_in_inPredicate1495 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literalOrParameterName_in_inValueList1524 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_COMMA_in_inValueList1527 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000FF8L});
+    public static final BitSet FOLLOW_literalOrParameterName_in_inValueList1529 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_columnReference_in_likePredicate1555 = new BitSet(new long[]{0x0102000000000000L});
+    public static final BitSet FOLLOW_NOT_in_likePredicate1557 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_LIKE_in_likePredicate1560 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_characterStringLiteral_in_likePredicate1562 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_nullPredicate1596 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_multiValuedColumnReference_in_nullPredicate1600 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_IS_in_nullPredicate1603 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_NULL_in_nullPredicate1605 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_nullPredicate1634 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_multiValuedColumnReference_in_nullPredicate1638 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_IS_in_nullPredicate1641 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_NOT_in_nullPredicate1643 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_NULL_in_nullPredicate1645 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literalOrParameterName_in_quantifiedComparisonPredicate1673 = new BitSet(new long[]{0x007C200000000000L});
+    public static final BitSet FOLLOW_compOp_in_quantifiedComparisonPredicate1675 = new BitSet(new long[]{0x0800000000000000L});
+    public static final BitSet FOLLOW_ANY_in_quantifiedComparisonPredicate1677 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000001E67L});
+    public static final BitSet FOLLOW_multiValuedColumnReference_in_quantifiedComparisonPredicate1679 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ANY_in_quantifiedInPredicate1708 = new BitSet(new long[]{0xFF83DF8580000000L,0x0000000000001E67L});
+    public static final BitSet FOLLOW_multiValuedColumnReference_in_quantifiedInPredicate1710 = new BitSet(new long[]{0x0082000000000000L});
+    public static final BitSet FOLLOW_NOT_in_quantifiedInPredicate1712 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_IN_in_quantifiedInPredicate1715 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_LPAREN_in_quantifiedInPredicate1718 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000FF8L});
+    public static final BitSet FOLLOW_inValueList_in_quantifiedInPredicate1720 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_RPAREN_in_quantifiedInPredicate1722 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_CONTAINS_in_textSearchPredicate1751 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_LPAREN_in_textSearchPredicate1753 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000070L});
+    public static final BitSet FOLLOW_qualifier_in_textSearchPredicate1756 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_COMMA_in_textSearchPredicate1758 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000070L});
+    public static final BitSet FOLLOW_textSearchExpression_in_textSearchPredicate1762 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_RPAREN_in_textSearchPredicate1764 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_FOLDER_in_folderPredicate1789 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_folderPredicateArgs_in_folderPredicate1792 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_TREE_in_folderPredicate1813 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_folderPredicateArgs_in_folderPredicate1815 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_folderPredicateArgs1837 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000070L});
+    public static final BitSet FOLLOW_qualifier_in_folderPredicateArgs1840 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_COMMA_in_folderPredicateArgs1842 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000070L});
+    public static final BitSet FOLLOW_folderId_in_folderPredicateArgs1846 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_RPAREN_in_folderPredicateArgs1848 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ORDER_in_orderByClause1887 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_BY_in_orderByClause1889 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_sortSpecification_in_orderByClause1891 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_COMMA_in_orderByClause1895 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_sortSpecification_in_orderByClause1897 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_columnReference_in_sortSpecification1923 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_sortSpecification1941 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000006L});
+    public static final BitSet FOLLOW_ASC_in_sortSpecification1947 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DESC_in_sortSpecification1953 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_correlationName1980 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_tableName1994 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_columnName2012 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_multiValuedColumnName2031 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLON_in_parameterName2049 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_identifier_in_parameterName2051 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_characterStringLiteral_in_folderId2074 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_QUOTED_STRING_in_textSearchExpression2095 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_identifier2107 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_QUOTE_in_identifier2122 = new BitSet(new long[]{0xFF83DF8480000000L,0x0000000000001E67L});
+    public static final BitSet FOLLOW_keyWordOrId_in_identifier2124 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_DOUBLE_QUOTE_in_identifier2126 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOATING_POINT_LITERAL_in_signedNumericLiteral2146 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_integerLiteral_in_signedNumericLiteral2161 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DECIMAL_INTEGER_LITERAL_in_integerLiteral2180 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TRUE_in_booleanLiteral2204 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FALSE_in_booleanLiteral2222 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TIMESTAMP_in_datetimeLiteral2247 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_QUOTED_STRING_in_datetimeLiteral2249 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_QUOTED_STRING_in_characterStringLiteral2272 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SELECT_in_keyWord2298 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AS_in_keyWord2303 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FROM_in_keyWord2308 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_JOIN_in_keyWord2314 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INNER_in_keyWord2320 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_in_keyWord2326 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OUTER_in_keyWord2332 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ON_in_keyWord2338 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_WHERE_in_keyWord2344 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OR_in_keyWord2350 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AND_in_keyWord2356 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NOT_in_keyWord2362 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_in_keyWord2368 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LIKE_in_keyWord2374 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IS_in_keyWord2380 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_keyWord2386 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ANY_in_keyWord2392 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_CONTAINS_in_keyWord2398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_FOLDER_in_keyWord2405 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_TREE_in_keyWord2411 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ORDER_in_keyWord2417 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BY_in_keyWord2422 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ASC_in_keyWord2428 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DESC_in_keyWord2434 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TIMESTAMP_in_keyWord2439 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TRUE_in_keyWord2444 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FALSE_in_keyWord2449 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_cmisFunction_in_keyWord2454 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SCORE_in_cmisFunction2465 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_keyWord_in_keyWordOrId2483 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_keyWordOrId2495 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_valueExpression_in_synpred1_CMIS340 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_tableName_in_synpred2_CMIS771 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_synpred3_CMIS1592 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_synpred4_CMIS1630 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java
index b85f7843f9..6d4e6ec7d3 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java
@@ -48,7 +48,7 @@ public class CMISTest extends TestCase
         System.out.print(executer.execTest());  // unit test result
         
         assertEquals("Failures ", 0, executer.failures.size()); 
-        assertEquals("Invalids ", 1, executer.invalids.size()); 
+        assertEquals("Invalids ", 0, executer.invalids.size()); 
     }
 
     private GrammarInfo parse(CharStream input) throws RecognitionException
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit b/source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit
index 59fd89c403..031bbce2d5 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit
+++ b/source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit
@@ -7,6 +7,6 @@ gunit CMIS;
 /** Parser */
 
 query:
-"SELECT Name, ObjectId, asdf asdfasdf asdfasdf asdfasdfasdf FROM DOCUMENT" FAIL
+"SELECT * from DOCUMENT D JION DOCUMENT DD ON (D.ID = DD.ID)" FAIL