diff --git a/source/java/org/alfresco/cmis/search/QueryTest.java b/source/java/org/alfresco/cmis/search/QueryTest.java
index f2192e57e9..30851da1c4 100644
--- a/source/java/org/alfresco/cmis/search/QueryTest.java
+++ b/source/java/org/alfresco/cmis/search/QueryTest.java
@@ -1703,7 +1703,15 @@ public class QueryTest extends BaseCMISTest
         query = "SELECT D.*, T.* FROM CM_TITLED T JOIN DOCUMENT D ON (D.OBJECTID = T.OBJECTID)";
         parse(query);
     }
+    
+    public void testParseIssues() throws RecognitionException
+    {
+        String query = "SELECT Name, ObjectId, asdf asdfasdf asdfasdf asdfasdfasdf FROM DOCUMENT";
+        parse(query);
+    }
 
+    
+    
     public void testAspectProperties()
     {
         CMISQueryOptions options = new CMISQueryOptions("SELECT * FROM CM_OWNABLE O", rootNodeRef.getStoreRef());
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 5d62be772a..56d11b2e89 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g
@@ -106,7 +106,7 @@ tokens
 	   if(e instanceof NoViableAltException)
 	   {
 	        NoViableAltException nvae = (NoViableAltException)e;
-	        msg = " no viable alt; token="+e.token+
+	        msg = "No viable alt; token="+e.token+
 	         " (decision="+nvae.decisionNumber+
 	         " state "+nvae.stateNumber+")"+
 	         " decision=<<"+nvae.grammarDecisionDescription+">>";
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 a680128a41..9f0e33d6ad 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.1b1 W:\\workspace-cmis2\\ANTLR\\CMIS.g 2008-08-07 14:37:14
+// $ANTLR 3.1.2 W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2009-03-18 14:58:50
 package org.alfresco.repo.search.impl.parsers;
 
 import org.antlr.runtime.*;
@@ -102,18 +102,18 @@ public class CMISLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "W:\\workspace-cmis2\\ANTLR\\CMIS.g"; }
+    public String getGrammarFileName() { return "W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g"; }
 
-    // $ANTLR start QUOTED_STRING
+    // $ANTLR start "QUOTED_STRING"
     public final void mQUOTED_STRING() throws RecognitionException {
         try {
             int _type = QUOTED_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:507:5: ( '\\'' (~ '\\'' | '\\'\\'' )* '\\'' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:507:9: '\\'' (~ '\\'' | '\\'\\'' )* '\\''
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:507:5: ( '\\'' (~ '\\'' | '\\'\\'' )* '\\'' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:507:9: '\\'' (~ '\\'' | '\\'\\'' )* '\\''
             {
             match('\''); 
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:507:14: (~ '\\'' | '\\'\\'' )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:507:14: (~ '\\'' | '\\'\\'' )*
             loop1:
             do {
                 int alt1=3;
@@ -128,16 +128,16 @@ public class CMISLexer extends Lexer {
 
 
                 }
-                else if ( ((LA1_0>='\u0000' && LA1_0<='&')||(LA1_0>='(' && LA1_0<='\uFFFE')) ) {
+                else if ( ((LA1_0>='\u0000' && LA1_0<='&')||(LA1_0>='(' && LA1_0<='\uFFFF')) ) {
                     alt1=1;
                 }
 
 
                 switch (alt1) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:507:16: ~ '\\''
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:507:16: ~ '\\''
             	    {
-            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\uFFFE') ) {
+            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
 
             	    }
@@ -150,9 +150,9 @@ public class CMISLexer extends Lexer {
             	    }
             	    break;
             	case 2 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:507:24: '\\'\\''
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:507:24: '\\'\\''
             	    {
-            	    match("\'\'"); 
+            	    match("''"); 
 
 
             	    }
@@ -173,15 +173,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end QUOTED_STRING
+    // $ANTLR end "QUOTED_STRING"
 
-    // $ANTLR start SELECT
+    // $ANTLR start "SELECT"
     public final void mSELECT() throws RecognitionException {
         try {
             int _type = SELECT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:510:8: ( ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:510:10: ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:510:8: ( ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:510:10: ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' )
             {
             if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
                 input.consume();
@@ -246,15 +246,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end SELECT
+    // $ANTLR end "SELECT"
 
-    // $ANTLR start AS
+    // $ANTLR start "AS"
     public final void mAS() throws RecognitionException {
         try {
             int _type = AS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:511:4: ( ( 'A' | 'a' ) ( 'S' | 's' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:511:6: ( 'A' | 'a' ) ( 'S' | 's' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:511:4: ( ( 'A' | 'a' ) ( 'S' | 's' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:511:6: ( 'A' | 'a' ) ( 'S' | 's' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -283,15 +283,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end AS
+    // $ANTLR end "AS"
 
-    // $ANTLR start UPPER
+    // $ANTLR start "UPPER"
     public final void mUPPER() throws RecognitionException {
         try {
             int _type = UPPER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:512:7: ( ( 'U' | 'u' ) ( 'P' | 'p' ) ( 'P' | 'p' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:512:9: ( 'U' | 'u' ) ( 'P' | 'p' ) ( 'P' | 'p' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:512:7: ( ( 'U' | 'u' ) ( 'P' | 'p' ) ( 'P' | 'p' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:512:9: ( 'U' | 'u' ) ( 'P' | 'p' ) ( 'P' | 'p' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='U'||input.LA(1)=='u' ) {
                 input.consume();
@@ -347,15 +347,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end UPPER
+    // $ANTLR end "UPPER"
 
-    // $ANTLR start LOWER
+    // $ANTLR start "LOWER"
     public final void mLOWER() throws RecognitionException {
         try {
             int _type = LOWER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:513:7: ( ( 'L' | 'l' ) ( 'O' | 'o' ) ( 'W' | 'w' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:513:9: ( 'L' | 'l' ) ( 'O' | 'o' ) ( 'W' | 'w' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:513:7: ( ( 'L' | 'l' ) ( 'O' | 'o' ) ( 'W' | 'w' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:513:9: ( 'L' | 'l' ) ( 'O' | 'o' ) ( 'W' | 'w' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                 input.consume();
@@ -411,15 +411,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end LOWER
+    // $ANTLR end "LOWER"
 
-    // $ANTLR start FROM
+    // $ANTLR start "FROM"
     public final void mFROM() throws RecognitionException {
         try {
             int _type = FROM;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:514:6: ( ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:514:8: ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:514:6: ( ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:514:8: ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' )
             {
             if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
                 input.consume();
@@ -466,15 +466,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end FROM
+    // $ANTLR end "FROM"
 
-    // $ANTLR start JOIN
+    // $ANTLR start "JOIN"
     public final void mJOIN() throws RecognitionException {
         try {
             int _type = JOIN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:515:6: ( ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:515:8: ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:515:6: ( ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:515:8: ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' )
             {
             if ( input.LA(1)=='J'||input.LA(1)=='j' ) {
                 input.consume();
@@ -521,15 +521,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end JOIN
+    // $ANTLR end "JOIN"
 
-    // $ANTLR start INNER
+    // $ANTLR start "INNER"
     public final void mINNER() throws RecognitionException {
         try {
             int _type = INNER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:516:7: ( ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:516:9: ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:7: ( ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:516:9: ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -585,15 +585,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end INNER
+    // $ANTLR end "INNER"
 
-    // $ANTLR start LEFT
+    // $ANTLR start "LEFT"
     public final void mLEFT() throws RecognitionException {
         try {
             int _type = LEFT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:517:6: ( ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:517:8: ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:517:6: ( ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:517:8: ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' )
             {
             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                 input.consume();
@@ -640,15 +640,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end LEFT
+    // $ANTLR end "LEFT"
 
-    // $ANTLR start OUTER
+    // $ANTLR start "OUTER"
     public final void mOUTER() throws RecognitionException {
         try {
             int _type = OUTER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:518:7: ( ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:518:9: ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:7: ( ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:9: ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -704,15 +704,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end OUTER
+    // $ANTLR end "OUTER"
 
-    // $ANTLR start ON
+    // $ANTLR start "ON"
     public final void mON() throws RecognitionException {
         try {
             int _type = ON;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:519:4: ( ( 'O' | 'o' ) ( 'N' | 'n' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:519:6: ( 'O' | 'o' ) ( 'N' | 'n' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:519:4: ( ( 'O' | 'o' ) ( 'N' | 'n' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:519:6: ( 'O' | 'o' ) ( 'N' | 'n' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -741,15 +741,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end ON
+    // $ANTLR end "ON"
 
-    // $ANTLR start WHERE
+    // $ANTLR start "WHERE"
     public final void mWHERE() throws RecognitionException {
         try {
             int _type = WHERE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:520:7: ( ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:520:9: ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:520:7: ( ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:520:9: ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='W'||input.LA(1)=='w' ) {
                 input.consume();
@@ -805,15 +805,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end WHERE
+    // $ANTLR end "WHERE"
 
-    // $ANTLR start OR
+    // $ANTLR start "OR"
     public final void mOR() throws RecognitionException {
         try {
             int _type = OR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:521:4: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:521:6: ( 'O' | 'o' ) ( 'R' | 'r' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:521:4: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:521:6: ( 'O' | 'o' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -842,15 +842,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end OR
+    // $ANTLR end "OR"
 
-    // $ANTLR start AND
+    // $ANTLR start "AND"
     public final void mAND() throws RecognitionException {
         try {
             int _type = AND;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:522:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:522:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:522:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:522:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -888,15 +888,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end AND
+    // $ANTLR end "AND"
 
-    // $ANTLR start NOT
+    // $ANTLR start "NOT"
     public final void mNOT() throws RecognitionException {
         try {
             int _type = NOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:523:5: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:523:7: ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:523:5: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:523:7: ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' )
             {
             if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
                 input.consume();
@@ -934,15 +934,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end NOT
+    // $ANTLR end "NOT"
 
-    // $ANTLR start IN
+    // $ANTLR start "IN"
     public final void mIN() throws RecognitionException {
         try {
             int _type = IN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:524:4: ( ( 'I' | 'i' ) ( 'N' | 'n' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:524:6: ( 'I' | 'i' ) ( 'N' | 'n' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:524:4: ( ( 'I' | 'i' ) ( 'N' | 'n' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:524:6: ( 'I' | 'i' ) ( 'N' | 'n' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -971,15 +971,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end IN
+    // $ANTLR end "IN"
 
-    // $ANTLR start LIKE
+    // $ANTLR start "LIKE"
     public final void mLIKE() throws RecognitionException {
         try {
             int _type = LIKE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:525:6: ( ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:525:8: ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:525:6: ( ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:525:8: ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                 input.consume();
@@ -1026,15 +1026,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end LIKE
+    // $ANTLR end "LIKE"
 
-    // $ANTLR start IS
+    // $ANTLR start "IS"
     public final void mIS() throws RecognitionException {
         try {
             int _type = IS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:526:4: ( ( 'I' | 'i' ) ( 'S' | 's' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:526:6: ( 'I' | 'i' ) ( 'S' | 's' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:526:4: ( ( 'I' | 'i' ) ( 'S' | 's' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:526:6: ( 'I' | 'i' ) ( 'S' | 's' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -1063,15 +1063,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end IS
+    // $ANTLR end "IS"
 
-    // $ANTLR start NULL
+    // $ANTLR start "NULL"
     public final void mNULL() throws RecognitionException {
         try {
             int _type = NULL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:527:6: ( ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:527:8: ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:527:6: ( ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:527:8: ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' )
             {
             if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
                 input.consume();
@@ -1118,15 +1118,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end NULL
+    // $ANTLR end "NULL"
 
-    // $ANTLR start ANY
+    // $ANTLR start "ANY"
     public final void mANY() throws RecognitionException {
         try {
             int _type = ANY;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:528:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:528:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:528:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:528:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -1164,15 +1164,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end ANY
+    // $ANTLR end "ANY"
 
-    // $ANTLR start CONTAINS
+    // $ANTLR start "CONTAINS"
     public final void mCONTAINS() throws RecognitionException {
         try {
             int _type = CONTAINS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:529:9: ( ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:529:11: ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:529:9: ( ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:529: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();
@@ -1255,15 +1255,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end CONTAINS
+    // $ANTLR end "CONTAINS"
 
-    // $ANTLR start IN_FOLDER
+    // $ANTLR start "IN_FOLDER"
     public final void mIN_FOLDER() throws RecognitionException {
         try {
             int _type = IN_FOLDER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:531:2: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:531:4: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:531:2: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:531: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();
@@ -1347,15 +1347,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end IN_FOLDER
+    // $ANTLR end "IN_FOLDER"
 
-    // $ANTLR start IN_TREE
+    // $ANTLR start "IN_TREE"
     public final void mIN_TREE() throws RecognitionException {
         try {
             int _type = IN_TREE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:532:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:532:11: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:532:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:532:11: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
                 input.consume();
@@ -1421,15 +1421,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end IN_TREE
+    // $ANTLR end "IN_TREE"
 
-    // $ANTLR start ORDER
+    // $ANTLR start "ORDER"
     public final void mORDER() throws RecognitionException {
         try {
             int _type = ORDER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:533:7: ( ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:533:9: ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:533:7: ( ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:533:9: ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -1485,15 +1485,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end ORDER
+    // $ANTLR end "ORDER"
 
-    // $ANTLR start BY
+    // $ANTLR start "BY"
     public final void mBY() throws RecognitionException {
         try {
             int _type = BY;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:534:4: ( ( 'B' | 'b' ) ( 'Y' | 'y' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:534:6: ( 'B' | 'b' ) ( 'Y' | 'y' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:534:4: ( ( 'B' | 'b' ) ( 'Y' | 'y' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:534:6: ( 'B' | 'b' ) ( 'Y' | 'y' )
             {
             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                 input.consume();
@@ -1522,15 +1522,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end BY
+    // $ANTLR end "BY"
 
-    // $ANTLR start ASC
+    // $ANTLR start "ASC"
     public final void mASC() throws RecognitionException {
         try {
             int _type = ASC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:535:5: ( ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:535:7: ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:535:5: ( ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:535:7: ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -1568,15 +1568,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end ASC
+    // $ANTLR end "ASC"
 
-    // $ANTLR start DESC
+    // $ANTLR start "DESC"
     public final void mDESC() throws RecognitionException {
         try {
             int _type = DESC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:536:6: ( ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:536:8: ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:536:6: ( ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:536:8: ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' )
             {
             if ( input.LA(1)=='D'||input.LA(1)=='d' ) {
                 input.consume();
@@ -1623,15 +1623,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DESC
+    // $ANTLR end "DESC"
 
-    // $ANTLR start SCORE
+    // $ANTLR start "SCORE"
     public final void mSCORE() throws RecognitionException {
         try {
             int _type = SCORE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:537:7: ( ( 'S' | 's' ) ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:537:9: ( 'S' | 's' ) ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'E' | 'e' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:7: ( ( 'S' | 's' ) ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:9: ( 'S' | 's' ) ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'E' | 'e' )
             {
             if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
                 input.consume();
@@ -1687,15 +1687,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end SCORE
+    // $ANTLR end "SCORE"
 
-    // $ANTLR start LPAREN
+    // $ANTLR start "LPAREN"
     public final void mLPAREN() throws RecognitionException {
         try {
             int _type = LPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:538:8: ( '(' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:538:10: '('
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:538:8: ( '(' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:538:10: '('
             {
             match('('); 
 
@@ -1707,15 +1707,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end LPAREN
+    // $ANTLR end "LPAREN"
 
-    // $ANTLR start RPAREN
+    // $ANTLR start "RPAREN"
     public final void mRPAREN() throws RecognitionException {
         try {
             int _type = RPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:539:8: ( ')' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:539:10: ')'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:539:8: ( ')' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:539:10: ')'
             {
             match(')'); 
 
@@ -1727,15 +1727,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end RPAREN
+    // $ANTLR end "RPAREN"
 
-    // $ANTLR start STAR
+    // $ANTLR start "STAR"
     public final void mSTAR() throws RecognitionException {
         try {
             int _type = STAR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:540:6: ( '*' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:540:8: '*'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:540:6: ( '*' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:540:8: '*'
             {
             match('*'); 
 
@@ -1747,15 +1747,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end STAR
+    // $ANTLR end "STAR"
 
-    // $ANTLR start COMMA
+    // $ANTLR start "COMMA"
     public final void mCOMMA() throws RecognitionException {
         try {
             int _type = COMMA;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:541:7: ( ',' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:541:9: ','
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:541:7: ( ',' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:541:9: ','
             {
             match(','); 
 
@@ -1767,15 +1767,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end COMMA
+    // $ANTLR end "COMMA"
 
-    // $ANTLR start DOTSTAR
+    // $ANTLR start "DOTSTAR"
     public final void mDOTSTAR() throws RecognitionException {
         try {
             int _type = DOTSTAR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:542:9: ( '.*' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:542:11: '.*'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:542:9: ( '.*' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:542:11: '.*'
             {
             match(".*"); 
 
@@ -1788,15 +1788,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DOTSTAR
+    // $ANTLR end "DOTSTAR"
 
-    // $ANTLR start DOT
+    // $ANTLR start "DOT"
     public final void mDOT() throws RecognitionException {
         try {
             int _type = DOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:543:5: ( '.' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:543:7: '.'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:543:5: ( '.' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:543:7: '.'
             {
             match('.'); 
 
@@ -1808,15 +1808,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DOT
+    // $ANTLR end "DOT"
 
-    // $ANTLR start DOTDOT
+    // $ANTLR start "DOTDOT"
     public final void mDOTDOT() throws RecognitionException {
         try {
             int _type = DOTDOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:544:8: ( '..' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:544:10: '..'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:544:8: ( '..' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:544:10: '..'
             {
             match(".."); 
 
@@ -1829,15 +1829,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DOTDOT
+    // $ANTLR end "DOTDOT"
 
-    // $ANTLR start EQUALS
+    // $ANTLR start "EQUALS"
     public final void mEQUALS() throws RecognitionException {
         try {
             int _type = EQUALS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:545:9: ( '=' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:545:11: '='
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:545:9: ( '=' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:545:11: '='
             {
             match('='); 
 
@@ -1849,15 +1849,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end EQUALS
+    // $ANTLR end "EQUALS"
 
-    // $ANTLR start TILDA
+    // $ANTLR start "TILDA"
     public final void mTILDA() throws RecognitionException {
         try {
             int _type = TILDA;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:546:7: ( '~' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:546:9: '~'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:7: ( '~' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:9: '~'
             {
             match('~'); 
 
@@ -1869,15 +1869,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end TILDA
+    // $ANTLR end "TILDA"
 
-    // $ANTLR start NOTEQUALS
+    // $ANTLR start "NOTEQUALS"
     public final void mNOTEQUALS() throws RecognitionException {
         try {
             int _type = NOTEQUALS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:548:2: ( '<>' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:548:4: '<>'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:548:2: ( '<>' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:548:4: '<>'
             {
             match("<>"); 
 
@@ -1890,15 +1890,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end NOTEQUALS
+    // $ANTLR end "NOTEQUALS"
 
-    // $ANTLR start GREATERTHAN
+    // $ANTLR start "GREATERTHAN"
     public final void mGREATERTHAN() throws RecognitionException {
         try {
             int _type = GREATERTHAN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:550:2: ( '>' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:550:4: '>'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:550:2: ( '>' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:550:4: '>'
             {
             match('>'); 
 
@@ -1910,15 +1910,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end GREATERTHAN
+    // $ANTLR end "GREATERTHAN"
 
-    // $ANTLR start LESSTHAN
+    // $ANTLR start "LESSTHAN"
     public final void mLESSTHAN() throws RecognitionException {
         try {
             int _type = LESSTHAN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:552:2: ( '<' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:552:4: '<'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:552:2: ( '<' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:552:4: '<'
             {
             match('<'); 
 
@@ -1930,15 +1930,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end LESSTHAN
+    // $ANTLR end "LESSTHAN"
 
-    // $ANTLR start GREATERTHANOREQUALS
+    // $ANTLR start "GREATERTHANOREQUALS"
     public final void mGREATERTHANOREQUALS() throws RecognitionException {
         try {
             int _type = GREATERTHANOREQUALS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:554:2: ( '>=' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:554:4: '>='
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:554:2: ( '>=' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:554:4: '>='
             {
             match(">="); 
 
@@ -1951,15 +1951,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end GREATERTHANOREQUALS
+    // $ANTLR end "GREATERTHANOREQUALS"
 
-    // $ANTLR start LESSTHANOREQUALS
+    // $ANTLR start "LESSTHANOREQUALS"
     public final void mLESSTHANOREQUALS() throws RecognitionException {
         try {
             int _type = LESSTHANOREQUALS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:556:2: ( '<=' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:556:4: '<='
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:556:2: ( '<=' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:556:4: '<='
             {
             match("<="); 
 
@@ -1972,15 +1972,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end LESSTHANOREQUALS
+    // $ANTLR end "LESSTHANOREQUALS"
 
-    // $ANTLR start COLON
+    // $ANTLR start "COLON"
     public final void mCOLON() throws RecognitionException {
         try {
             int _type = COLON;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:557:7: ( ':' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:557:9: ':'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:557:7: ( ':' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:557:9: ':'
             {
             match(':'); 
 
@@ -1992,15 +1992,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end COLON
+    // $ANTLR end "COLON"
 
-    // $ANTLR start DOUBLE_QUOTE
+    // $ANTLR start "DOUBLE_QUOTE"
     public final void mDOUBLE_QUOTE() throws RecognitionException {
         try {
             int _type = DOUBLE_QUOTE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:560:2: ( '\"' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:560:4: '\"'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:560:2: ( '\"' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:560:4: '\"'
             {
             match('\"'); 
 
@@ -2012,17 +2012,17 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DOUBLE_QUOTE
+    // $ANTLR end "DOUBLE_QUOTE"
 
-    // $ANTLR start DECIMAL_INTEGER_LITERAL
+    // $ANTLR start "DECIMAL_INTEGER_LITERAL"
     public final void mDECIMAL_INTEGER_LITERAL() throws RecognitionException {
         try {
             int _type = DECIMAL_INTEGER_LITERAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:568:9: ( ( PLUS | MINUS )? DECIMAL_NUMERAL )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:568:11: ( PLUS | MINUS )? DECIMAL_NUMERAL
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:568:9: ( ( PLUS | MINUS )? DECIMAL_NUMERAL )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:568:11: ( PLUS | MINUS )? DECIMAL_NUMERAL
             {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:568:11: ( PLUS | MINUS )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:568:11: ( PLUS | MINUS )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -2031,7 +2031,7 @@ public class CMISLexer extends Lexer {
             }
             switch (alt2) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
                     {
                     if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                         input.consume();
@@ -2058,21 +2058,21 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DECIMAL_INTEGER_LITERAL
+    // $ANTLR end "DECIMAL_INTEGER_LITERAL"
 
-    // $ANTLR start FLOATING_POINT_LITERAL
+    // $ANTLR start "FLOATING_POINT_LITERAL"
     public final void mFLOATING_POINT_LITERAL() throws RecognitionException {
         try {
             int _type = FLOATING_POINT_LITERAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:575:2: ( ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? | DOT ( DIGIT )+ ( EXPONENT )? | ( DIGIT )+ EXPONENT )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:2: ( ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? | DOT ( DIGIT )+ ( EXPONENT )? | ( DIGIT )+ EXPONENT )
             int alt9=3;
             alt9 = dfa9.predict(input);
             switch (alt9) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:575:4: ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:4: ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )?
                     {
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:575:4: ( DIGIT )+
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:4: ( DIGIT )+
                     int cnt3=0;
                     loop3:
                     do {
@@ -2086,7 +2086,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt3) {
                     	case 1 :
-                    	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:575:4: DIGIT
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:4: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2103,7 +2103,7 @@ public class CMISLexer extends Lexer {
                     } while (true);
 
                     mDOT(); 
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:575:15: ( DIGIT )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:15: ( DIGIT )*
                     loop4:
                     do {
                         int alt4=2;
@@ -2116,7 +2116,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt4) {
                     	case 1 :
-                    	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:575:15: DIGIT
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:15: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2128,7 +2128,7 @@ public class CMISLexer extends Lexer {
                         }
                     } while (true);
 
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:575:22: ( EXPONENT )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:22: ( EXPONENT )?
                     int alt5=2;
                     int LA5_0 = input.LA(1);
 
@@ -2137,7 +2137,7 @@ public class CMISLexer extends Lexer {
                     }
                     switch (alt5) {
                         case 1 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:575:22: EXPONENT
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:22: EXPONENT
                             {
                             mEXPONENT(); 
 
@@ -2150,10 +2150,10 @@ public class CMISLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:576:4: DOT ( DIGIT )+ ( EXPONENT )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:4: DOT ( DIGIT )+ ( EXPONENT )?
                     {
                     mDOT(); 
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:576:8: ( DIGIT )+
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:8: ( DIGIT )+
                     int cnt6=0;
                     loop6:
                     do {
@@ -2167,7 +2167,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:576:8: DIGIT
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:8: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2183,7 +2183,7 @@ public class CMISLexer extends Lexer {
                         cnt6++;
                     } while (true);
 
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:576:15: ( EXPONENT )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:15: ( EXPONENT )?
                     int alt7=2;
                     int LA7_0 = input.LA(1);
 
@@ -2192,7 +2192,7 @@ public class CMISLexer extends Lexer {
                     }
                     switch (alt7) {
                         case 1 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:576:15: EXPONENT
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:15: EXPONENT
                             {
                             mEXPONENT(); 
 
@@ -2205,9 +2205,9 @@ public class CMISLexer extends Lexer {
                     }
                     break;
                 case 3 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:577:4: ( DIGIT )+ EXPONENT
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:577:4: ( DIGIT )+ EXPONENT
                     {
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:577:4: ( DIGIT )+
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:577:4: ( DIGIT )+
                     int cnt8=0;
                     loop8:
                     do {
@@ -2221,7 +2221,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt8) {
                     	case 1 :
-                    	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:577:4: DIGIT
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:577:4: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2249,15 +2249,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end FLOATING_POINT_LITERAL
+    // $ANTLR end "FLOATING_POINT_LITERAL"
 
-    // $ANTLR start ID
+    // $ANTLR start "ID"
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:581:4: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )* )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:581:6: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:581:4: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )* )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:581:6: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )*
             {
             if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
                 input.consume();
@@ -2268,7 +2268,7 @@ public class CMISLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:581:29: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:581:29: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )*
             loop10:
             do {
                 int alt10=2;
@@ -2281,7 +2281,7 @@ public class CMISLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
             	    {
             	    if ( (input.LA(1)>='#' && input.LA(1)<='$')||input.LA(1)=='0'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -2310,17 +2310,17 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end ID
+    // $ANTLR end "ID"
 
-    // $ANTLR start WS
+    // $ANTLR start "WS"
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:582:4: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:582:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:582:4: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:582:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:582:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:582:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt11=0;
             loop11:
             do {
@@ -2334,7 +2334,7 @@ public class CMISLexer extends Lexer {
 
                 switch (alt11) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2368,12 +2368,12 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end WS
+    // $ANTLR end "WS"
 
-    // $ANTLR start DECIMAL_NUMERAL
+    // $ANTLR start "DECIMAL_NUMERAL"
     public final void mDECIMAL_NUMERAL() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:591:2: ( ZERO_DIGIT | NON_ZERO_DIGIT ( DIGIT )* )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:591:2: ( ZERO_DIGIT | NON_ZERO_DIGIT ( DIGIT )* )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -2391,17 +2391,17 @@ public class CMISLexer extends Lexer {
             }
             switch (alt13) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:591:4: ZERO_DIGIT
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:591:4: ZERO_DIGIT
                     {
                     mZERO_DIGIT(); 
 
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:592:4: NON_ZERO_DIGIT ( DIGIT )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:592:4: NON_ZERO_DIGIT ( DIGIT )*
                     {
                     mNON_ZERO_DIGIT(); 
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:592:19: ( DIGIT )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:592:19: ( DIGIT )*
                     loop12:
                     do {
                         int alt12=2;
@@ -2414,7 +2414,7 @@ public class CMISLexer extends Lexer {
 
                         switch (alt12) {
                     	case 1 :
-                    	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:592:19: DIGIT
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:592:19: DIGIT
                     	    {
                     	    mDIGIT(); 
 
@@ -2435,13 +2435,13 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DECIMAL_NUMERAL
+    // $ANTLR end "DECIMAL_NUMERAL"
 
-    // $ANTLR start DIGIT
+    // $ANTLR start "DIGIT"
     public final void mDIGIT() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:595:7: ( ZERO_DIGIT | NON_ZERO_DIGIT )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:595:7: ( ZERO_DIGIT | NON_ZERO_DIGIT )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
             {
             if ( (input.LA(1)>='0' && input.LA(1)<='9') ) {
                 input.consume();
@@ -2459,13 +2459,13 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DIGIT
+    // $ANTLR end "DIGIT"
 
-    // $ANTLR start ZERO_DIGIT
+    // $ANTLR start "ZERO_DIGIT"
     public final void mZERO_DIGIT() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:598:2: ( '0' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:598:4: '0'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:598:2: ( '0' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:598:4: '0'
             {
             match('0'); 
 
@@ -2475,13 +2475,13 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end ZERO_DIGIT
+    // $ANTLR end "ZERO_DIGIT"
 
-    // $ANTLR start NON_ZERO_DIGIT
+    // $ANTLR start "NON_ZERO_DIGIT"
     public final void mNON_ZERO_DIGIT() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:601:2: ( '1' .. '9' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:601:4: '1' .. '9'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:2: ( '1' .. '9' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:4: '1' .. '9'
             {
             matchRange('1','9'); 
 
@@ -2491,13 +2491,13 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end NON_ZERO_DIGIT
+    // $ANTLR end "NON_ZERO_DIGIT"
 
-    // $ANTLR start PLUS
+    // $ANTLR start "PLUS"
     public final void mPLUS() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:603:6: ( '+' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:603:8: '+'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:603:6: ( '+' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:603:8: '+'
             {
             match('+'); 
 
@@ -2507,13 +2507,13 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end PLUS
+    // $ANTLR end "PLUS"
 
-    // $ANTLR start MINUS
+    // $ANTLR start "MINUS"
     public final void mMINUS() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:605:7: ( '-' )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:605:9: '-'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:605:7: ( '-' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:605:9: '-'
             {
             match('-'); 
 
@@ -2523,13 +2523,13 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end MINUS
+    // $ANTLR end "MINUS"
 
-    // $ANTLR start E
+    // $ANTLR start "E"
     public final void mE() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:608:3: ( ( 'e' | 'E' ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:608:5: ( 'e' | 'E' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:608:3: ( ( 'e' | 'E' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:608:5: ( 'e' | 'E' )
             {
             if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                 input.consume();
@@ -2547,13 +2547,13 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end E
+    // $ANTLR end "E"
 
-    // $ANTLR start EXPONENT
+    // $ANTLR start "EXPONENT"
     public final void mEXPONENT() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:619:2: ( E SIGNED_INTEGER )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:619:4: E SIGNED_INTEGER
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:619:2: ( E SIGNED_INTEGER )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:619:4: E SIGNED_INTEGER
             {
             mE(); 
             mSIGNED_INTEGER(); 
@@ -2564,15 +2564,15 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end EXPONENT
+    // $ANTLR end "EXPONENT"
 
-    // $ANTLR start SIGNED_INTEGER
+    // $ANTLR start "SIGNED_INTEGER"
     public final void mSIGNED_INTEGER() throws RecognitionException {
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:623:2: ( ( PLUS | MINUS )? ( DIGIT )+ )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:623:4: ( PLUS | MINUS )? ( DIGIT )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:2: ( ( PLUS | MINUS )? ( DIGIT )+ )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:4: ( PLUS | MINUS )? ( DIGIT )+
             {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:623:4: ( PLUS | MINUS )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:4: ( PLUS | MINUS )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -2581,7 +2581,7 @@ public class CMISLexer extends Lexer {
             }
             switch (alt14) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
                     {
                     if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                         input.consume();
@@ -2598,7 +2598,7 @@ public class CMISLexer extends Lexer {
 
             }
 
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:623:20: ( DIGIT )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:20: ( DIGIT )+
             int cnt15=0;
             loop15:
             do {
@@ -2612,7 +2612,7 @@ public class CMISLexer extends Lexer {
 
                 switch (alt15) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:623:20: DIGIT
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:20: DIGIT
             	    {
             	    mDIGIT(); 
 
@@ -2635,344 +2635,344 @@ public class CMISLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end SIGNED_INTEGER
+    // $ANTLR end "SIGNED_INTEGER"
 
     public void mTokens() throws RecognitionException {
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:8: ( QUOTED_STRING | SELECT | AS | UPPER | LOWER | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | 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 )
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:8: ( QUOTED_STRING | SELECT | AS | UPPER | LOWER | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | 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 alt16=48;
         alt16 = dfa16.predict(input);
         switch (alt16) {
             case 1 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:10: QUOTED_STRING
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:10: QUOTED_STRING
                 {
                 mQUOTED_STRING(); 
 
                 }
                 break;
             case 2 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:24: SELECT
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:24: SELECT
                 {
                 mSELECT(); 
 
                 }
                 break;
             case 3 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:31: AS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:31: AS
                 {
                 mAS(); 
 
                 }
                 break;
             case 4 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:34: UPPER
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:34: UPPER
                 {
                 mUPPER(); 
 
                 }
                 break;
             case 5 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:40: LOWER
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:40: LOWER
                 {
                 mLOWER(); 
 
                 }
                 break;
             case 6 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:46: FROM
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:46: FROM
                 {
                 mFROM(); 
 
                 }
                 break;
             case 7 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:51: JOIN
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:51: JOIN
                 {
                 mJOIN(); 
 
                 }
                 break;
             case 8 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:56: INNER
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:56: INNER
                 {
                 mINNER(); 
 
                 }
                 break;
             case 9 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:62: LEFT
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:62: LEFT
                 {
                 mLEFT(); 
 
                 }
                 break;
             case 10 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:67: OUTER
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:67: OUTER
                 {
                 mOUTER(); 
 
                 }
                 break;
             case 11 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:73: ON
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:73: ON
                 {
                 mON(); 
 
                 }
                 break;
             case 12 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:76: WHERE
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:76: WHERE
                 {
                 mWHERE(); 
 
                 }
                 break;
             case 13 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:82: OR
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:82: OR
                 {
                 mOR(); 
 
                 }
                 break;
             case 14 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:85: AND
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:85: AND
                 {
                 mAND(); 
 
                 }
                 break;
             case 15 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:89: NOT
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:89: NOT
                 {
                 mNOT(); 
 
                 }
                 break;
             case 16 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:93: IN
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:93: IN
                 {
                 mIN(); 
 
                 }
                 break;
             case 17 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:96: LIKE
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:96: LIKE
                 {
                 mLIKE(); 
 
                 }
                 break;
             case 18 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:101: IS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:101: IS
                 {
                 mIS(); 
 
                 }
                 break;
             case 19 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:104: NULL
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:104: NULL
                 {
                 mNULL(); 
 
                 }
                 break;
             case 20 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:109: ANY
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:109: ANY
                 {
                 mANY(); 
 
                 }
                 break;
             case 21 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:113: CONTAINS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:113: CONTAINS
                 {
                 mCONTAINS(); 
 
                 }
                 break;
             case 22 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:122: IN_FOLDER
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:122: IN_FOLDER
                 {
                 mIN_FOLDER(); 
 
                 }
                 break;
             case 23 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:132: IN_TREE
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:132: IN_TREE
                 {
                 mIN_TREE(); 
 
                 }
                 break;
             case 24 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:140: ORDER
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:140: ORDER
                 {
                 mORDER(); 
 
                 }
                 break;
             case 25 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:146: BY
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:146: BY
                 {
                 mBY(); 
 
                 }
                 break;
             case 26 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:149: ASC
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:149: ASC
                 {
                 mASC(); 
 
                 }
                 break;
             case 27 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:153: DESC
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:153: DESC
                 {
                 mDESC(); 
 
                 }
                 break;
             case 28 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:158: SCORE
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:158: SCORE
                 {
                 mSCORE(); 
 
                 }
                 break;
             case 29 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:164: LPAREN
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:164: LPAREN
                 {
                 mLPAREN(); 
 
                 }
                 break;
             case 30 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:171: RPAREN
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:171: RPAREN
                 {
                 mRPAREN(); 
 
                 }
                 break;
             case 31 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:178: STAR
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:178: STAR
                 {
                 mSTAR(); 
 
                 }
                 break;
             case 32 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:183: COMMA
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:183: COMMA
                 {
                 mCOMMA(); 
 
                 }
                 break;
             case 33 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:189: DOTSTAR
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:189: DOTSTAR
                 {
                 mDOTSTAR(); 
 
                 }
                 break;
             case 34 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:197: DOT
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:197: DOT
                 {
                 mDOT(); 
 
                 }
                 break;
             case 35 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:201: DOTDOT
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:201: DOTDOT
                 {
                 mDOTDOT(); 
 
                 }
                 break;
             case 36 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:208: EQUALS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:208: EQUALS
                 {
                 mEQUALS(); 
 
                 }
                 break;
             case 37 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:215: TILDA
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:215: TILDA
                 {
                 mTILDA(); 
 
                 }
                 break;
             case 38 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:221: NOTEQUALS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:221: NOTEQUALS
                 {
                 mNOTEQUALS(); 
 
                 }
                 break;
             case 39 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:231: GREATERTHAN
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:231: GREATERTHAN
                 {
                 mGREATERTHAN(); 
 
                 }
                 break;
             case 40 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:243: LESSTHAN
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:243: LESSTHAN
                 {
                 mLESSTHAN(); 
 
                 }
                 break;
             case 41 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:252: GREATERTHANOREQUALS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:252: GREATERTHANOREQUALS
                 {
                 mGREATERTHANOREQUALS(); 
 
                 }
                 break;
             case 42 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:272: LESSTHANOREQUALS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:272: LESSTHANOREQUALS
                 {
                 mLESSTHANOREQUALS(); 
 
                 }
                 break;
             case 43 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:289: COLON
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:289: COLON
                 {
                 mCOLON(); 
 
                 }
                 break;
             case 44 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:295: DOUBLE_QUOTE
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:295: DOUBLE_QUOTE
                 {
                 mDOUBLE_QUOTE(); 
 
                 }
                 break;
             case 45 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:308: DECIMAL_INTEGER_LITERAL
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:308: DECIMAL_INTEGER_LITERAL
                 {
                 mDECIMAL_INTEGER_LITERAL(); 
 
                 }
                 break;
             case 46 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:332: FLOATING_POINT_LITERAL
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:332: FLOATING_POINT_LITERAL
                 {
                 mFLOATING_POINT_LITERAL(); 
 
                 }
                 break;
             case 47 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:355: ID
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:355: ID
                 {
                 mID(); 
 
                 }
                 break;
             case 48 :
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:1:358: WS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:358: WS
                 {
                 mWS(); 
 
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 b36b46be0a..cad389f897 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.1b1 W:\\workspace-cmis2\\ANTLR\\CMIS.g 2008-08-07 14:37:14
+// $ANTLR 3.1.2 W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2009-03-18 14:58:50
 package org.alfresco.repo.search.impl.parsers;
 
 import org.antlr.runtime.*;
@@ -107,6 +107,7 @@ public class CMISParser extends Parser {
         }
         public CMISParser(TokenStream input, RecognizerSharedState state) {
             super(input, state);
+             
         }
         
     protected TreeAdaptor adaptor = new CommonTreeAdaptor();
@@ -119,7 +120,7 @@ public class CMISParser extends Parser {
     }
 
     public String[] getTokenNames() { return CMISParser.tokenNames; }
-    public String getGrammarFileName() { return "W:\\workspace-cmis2\\ANTLR\\CMIS.g"; }
+    public String getGrammarFileName() { return "W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g"; }
 
 
         private Stack<String> paraphrases = new Stack<String>();
@@ -149,7 +150,7 @@ public class CMISParser extends Parser {
     	   if(e instanceof NoViableAltException)
     	   {
     	        NoViableAltException nvae = (NoViableAltException)e;
-    	        msg = " no viable alt; token="+e.token+
+    	        msg = "No viable alt; token="+e.token+
     	         " (decision="+nvae.decisionNumber+
     	         " state "+nvae.stateNumber+")"+
     	         " decision=<<"+nvae.grammarDecisionDescription+">>";
@@ -178,8 +179,8 @@ public class CMISParser extends Parser {
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start query
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:142:1: query : SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) ;
+    // $ANTLR start "query"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:142: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);
@@ -206,8 +207,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_selectList=new RewriteRuleSubtreeStream(adaptor,"rule selectList");
         RewriteRuleSubtreeStream stream_fromClause=new RewriteRuleSubtreeStream(adaptor,"rule fromClause");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:149:2: ( SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:149:4: SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:149:2: ( SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:149:4: SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF
             {
             SELECT1=(Token)match(input,SELECT,FOLLOW_SELECT_in_query172); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_SELECT.add(SELECT1);
@@ -224,7 +225,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_fromClause.add(fromClause3.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:149:33: ( whereClause )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:149:33: ( whereClause )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -233,7 +234,7 @@ public class CMISParser extends Parser {
             }
             switch (alt1) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:149:33: whereClause
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:149:33: whereClause
                     {
                     pushFollow(FOLLOW_whereClause_in_query178);
                     whereClause4=whereClause();
@@ -247,7 +248,7 @@ public class CMISParser extends Parser {
 
             }
 
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:149:46: ( orderByClause )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:149:46: ( orderByClause )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -256,7 +257,7 @@ public class CMISParser extends Parser {
             }
             switch (alt2) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:149:46: orderByClause
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:149:46: orderByClause
                     {
                     pushFollow(FOLLOW_orderByClause_in_query181);
                     orderByClause5=orderByClause();
@@ -276,32 +277,33 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: whereClause, orderByClause, selectList, fromClause
+            // elements: orderByClause, fromClause, whereClause, selectList
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 150:3: -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:150:6: ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:150: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:\\workspace-cmis2\\ANTLR\\CMIS.g:150:36: ( whereClause )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:150:36: ( whereClause )?
                 if ( stream_whereClause.hasNext() ) {
                     adaptor.addChild(root_1, stream_whereClause.nextTree());
 
                 }
                 stream_whereClause.reset();
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:150:49: ( orderByClause )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:150:49: ( orderByClause )?
                 if ( stream_orderByClause.hasNext() ) {
                     adaptor.addChild(root_1, stream_orderByClause.nextTree());
 
@@ -313,7 +315,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -333,15 +335,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end query
+    // $ANTLR end "query"
 
     public static class selectList_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start selectList
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:154:1: selectList : ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) );
+    // $ANTLR start "selectList"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:154: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);
@@ -362,7 +364,7 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_selectSubList=new RewriteRuleSubtreeStream(adaptor,"rule selectSubList");
             paraphrases.push("in select list"); 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:157:2: ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:157:2: ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -381,7 +383,7 @@ public class CMISParser extends Parser {
             }
             switch (alt4) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:157:4: STAR
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:157:4: STAR
                     {
                     STAR7=(Token)match(input,STAR,FOLLOW_STAR_in_selectList233); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_STAR.add(STAR7);
@@ -394,14 +396,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 158:3: -> ^( ALL_COLUMNS )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:158:6: ^( ALL_COLUMNS )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:158:6: ^( ALL_COLUMNS )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(ALL_COLUMNS, "ALL_COLUMNS"), root_1);
@@ -411,11 +414,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:159:5: selectSubList ( COMMA selectSubList )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:159:5: selectSubList ( COMMA selectSubList )*
                     {
                     pushFollow(FOLLOW_selectSubList_in_selectList249);
                     selectSubList8=selectSubList();
@@ -423,7 +426,7 @@ public class CMISParser extends Parser {
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_selectSubList.add(selectSubList8.getTree());
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:159:19: ( COMMA selectSubList )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:159:19: ( COMMA selectSubList )*
                     loop3:
                     do {
                         int alt3=2;
@@ -436,7 +439,7 @@ public class CMISParser extends Parser {
 
                         switch (alt3) {
                     	case 1 :
-                    	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:159:21: COMMA selectSubList
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:159:21: COMMA selectSubList
                     	    {
                     	    COMMA9=(Token)match(input,COMMA,FOLLOW_COMMA_in_selectList253); if (state.failed) return retval; 
                     	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA9);
@@ -464,14 +467,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 160:3: -> ^( COLUMNS ( selectSubList )+ )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:160:6: ^( COLUMNS ( selectSubList )+ )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:160:6: ^( COLUMNS ( selectSubList )+ )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMNS, "COLUMNS"), root_1);
@@ -490,7 +494,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -515,15 +519,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end selectList
+    // $ANTLR end "selectList"
 
     public static class selectSubList_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start selectSubList
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:164:1: selectSubList : ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->);
+    // $ANTLR start "selectSubList"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:164: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);
@@ -550,7 +554,7 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:165:2: ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->)
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:165:2: ( ( valueExpression )=> valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) | multiValuedColumnReference ->)
             int alt7=3;
             int LA7_0 = input.LA(1);
 
@@ -659,7 +663,7 @@ public class CMISParser extends Parser {
             }
             switch (alt7) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:165:4: ( valueExpression )=> valueExpression ( ( AS )? columnName )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:165:4: ( valueExpression )=> valueExpression ( ( AS )? columnName )?
                     {
                     pushFollow(FOLLOW_valueExpression_in_selectSubList291);
                     valueExpression11=valueExpression();
@@ -667,7 +671,7 @@ public class CMISParser extends Parser {
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_valueExpression.add(valueExpression11.getTree());
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:165:40: ( ( AS )? columnName )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:165:40: ( ( AS )? columnName )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -676,9 +680,9 @@ public class CMISParser extends Parser {
                     }
                     switch (alt6) {
                         case 1 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:165:42: ( AS )? columnName
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:165:42: ( AS )? columnName
                             {
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:165:42: ( AS )?
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:165:42: ( AS )?
                             int alt5=2;
                             int LA5_0 = input.LA(1);
 
@@ -687,7 +691,7 @@ public class CMISParser extends Parser {
                             }
                             switch (alt5) {
                                 case 1 :
-                                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:165:42: AS
+                                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:165:42: AS
                                     {
                                     AS12=(Token)match(input,AS,FOLLOW_AS_in_selectSubList295); if (state.failed) return retval; 
                                     if ( state.backtracking==0 ) stream_AS.add(AS12);
@@ -718,20 +722,21 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 166:3: -> ^( COLUMN valueExpression ( columnName )? )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:166:6: ^( COLUMN valueExpression ( columnName )? )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:166: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:\\workspace-cmis2\\ANTLR\\CMIS.g:166:31: ( columnName )?
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:166:31: ( columnName )?
                         if ( stream_columnName.hasNext() ) {
                             adaptor.addChild(root_1, stream_columnName.nextTree());
 
@@ -743,11 +748,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:167:4: qualifier DOTSTAR
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:167:4: qualifier DOTSTAR
                     {
                     pushFollow(FOLLOW_qualifier_in_selectSubList319);
                     qualifier14=qualifier();
@@ -766,14 +771,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 168:3: -> ^( ALL_COLUMNS qualifier )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:168:6: ^( ALL_COLUMNS qualifier )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:168:6: ^( ALL_COLUMNS qualifier )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(ALL_COLUMNS, "ALL_COLUMNS"), root_1);
@@ -785,11 +791,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 3 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:169:4: multiValuedColumnReference
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:169:4: multiValuedColumnReference
                     {
                     pushFollow(FOLLOW_multiValuedColumnReference_in_selectSubList337);
                     multiValuedColumnReference16=multiValuedColumnReference();
@@ -805,9 +811,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 170:3: ->
@@ -815,7 +822,7 @@ public class CMISParser extends Parser {
                         root_0 = null;
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -837,15 +844,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end selectSubList
+    // $ANTLR end "selectSubList"
 
     public static class valueExpression_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start valueExpression
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:173:1: valueExpression : ( columnReference -> columnReference | valueFunction -> valueFunction );
+    // $ANTLR start "valueExpression"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:173: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);
@@ -860,7 +867,7 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_valueFunction=new RewriteRuleSubtreeStream(adaptor,"rule valueFunction");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:174:2: ( columnReference -> columnReference | valueFunction -> valueFunction )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:2: ( columnReference -> columnReference | valueFunction -> valueFunction )
             int alt8=2;
             switch ( input.LA(1) ) {
             case ID:
@@ -928,7 +935,7 @@ public class CMISParser extends Parser {
 
             switch (alt8) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:174:4: columnReference
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:174:4: columnReference
                     {
                     pushFollow(FOLLOW_columnReference_in_valueExpression356);
                     columnReference17=columnReference();
@@ -944,9 +951,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 175:3: -> columnReference
@@ -955,11 +963,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:176:5: valueFunction
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:176:5: valueFunction
                     {
                     pushFollow(FOLLOW_valueFunction_in_valueExpression369);
                     valueFunction18=valueFunction();
@@ -975,9 +983,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 177:3: -> valueFunction
@@ -986,7 +995,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -1008,15 +1017,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end valueExpression
+    // $ANTLR end "valueExpression"
 
     public static class columnReference_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start columnReference
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:180:1: columnReference : ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) ;
+    // $ANTLR start "columnReference"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:180: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);
@@ -1034,10 +1043,10 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:181:2: ( ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:181:4: ( qualifier DOT )? columnName
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:181:2: ( ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:181:4: ( qualifier DOT )? columnName
             {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:181:4: ( qualifier DOT )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:181:4: ( qualifier DOT )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1076,7 +1085,7 @@ public class CMISParser extends Parser {
             }
             switch (alt9) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:181:6: qualifier DOT
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:181:6: qualifier DOT
                     {
                     pushFollow(FOLLOW_qualifier_in_columnReference392);
                     qualifier19=qualifier();
@@ -1107,20 +1116,21 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 182:3: -> ^( COLUMN_REF columnName ( qualifier )? )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:182:6: ^( COLUMN_REF columnName ( qualifier )? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:182: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:\\workspace-cmis2\\ANTLR\\CMIS.g:182:30: ( qualifier )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:182:30: ( qualifier )?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_1, stream_qualifier.nextTree());
 
@@ -1132,7 +1142,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -1152,15 +1162,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end columnReference
+    // $ANTLR end "columnReference"
 
     public static class multiValuedColumnReference_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start multiValuedColumnReference
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:189:1: multiValuedColumnReference : ( qualifier DOT )? multiValuedColumnName -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? ) ;
+    // $ANTLR start "multiValuedColumnReference"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:189: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);
@@ -1178,10 +1188,10 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         RewriteRuleSubtreeStream stream_multiValuedColumnName=new RewriteRuleSubtreeStream(adaptor,"rule multiValuedColumnName");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:190:2: ( ( qualifier DOT )? multiValuedColumnName -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:190:10: ( qualifier DOT )? multiValuedColumnName
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:190:2: ( ( qualifier DOT )? multiValuedColumnName -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:190:10: ( qualifier DOT )? multiValuedColumnName
             {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:190:10: ( qualifier DOT )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:190:10: ( qualifier DOT )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1220,7 +1230,7 @@ public class CMISParser extends Parser {
             }
             switch (alt10) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:190:12: qualifier DOT
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:190:12: qualifier DOT
                     {
                     pushFollow(FOLLOW_qualifier_in_multiValuedColumnReference435);
                     qualifier22=qualifier();
@@ -1251,20 +1261,21 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 191:3: -> ^( COLUMN_REF multiValuedColumnName ( qualifier )? )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:191:6: ^( COLUMN_REF multiValuedColumnName ( qualifier )? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:191: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:\\workspace-cmis2\\ANTLR\\CMIS.g:191:41: ( qualifier )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:191:41: ( qualifier )?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_1, stream_qualifier.nextTree());
 
@@ -1276,7 +1287,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -1296,15 +1307,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end multiValuedColumnReference
+    // $ANTLR end "multiValuedColumnReference"
 
     public static class valueFunction_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start valueFunction
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:194:1: valueFunction : functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) ;
+    // $ANTLR start "valueFunction"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:194:1: valueFunction : 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);
@@ -1325,8 +1336,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_keyWordOrId=new RewriteRuleSubtreeStream(adaptor,"rule keyWordOrId");
         RewriteRuleSubtreeStream stream_functionArgument=new RewriteRuleSubtreeStream(adaptor,"rule functionArgument");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:195:2: (functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:195:4: functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:195:2: (functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:195:4: functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN
             {
             pushFollow(FOLLOW_keyWordOrId_in_valueFunction470);
             functionName=keyWordOrId();
@@ -1337,7 +1348,7 @@ public class CMISParser extends Parser {
             LPAREN25=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_valueFunction472); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN25);
 
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:195:36: ( functionArgument )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:195:36: ( functionArgument )*
             loop11:
             do {
                 int alt11=2;
@@ -1350,7 +1361,7 @@ public class CMISParser extends Parser {
 
                 switch (alt11) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:195:36: functionArgument
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:195:36: functionArgument
             	    {
             	    pushFollow(FOLLOW_functionArgument_in_valueFunction474);
             	    functionArgument26=functionArgument();
@@ -1373,27 +1384,28 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: functionArgument, RPAREN, LPAREN, functionName
+            // elements: functionName, functionArgument, RPAREN, LPAREN
             // 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,"token retval",retval!=null?retval.tree:null);
-            RewriteRuleSubtreeStream stream_functionName=new RewriteRuleSubtreeStream(adaptor,"token functionName",functionName!=null?functionName.tree:null);
+            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();
             // 196:3: -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:196:6: ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:196: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:\\workspace-cmis2\\ANTLR\\CMIS.g:196:38: ( functionArgument )*
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:196:38: ( functionArgument )*
                 while ( stream_functionArgument.hasNext() ) {
                     adaptor.addChild(root_1, stream_functionArgument.nextTree());
 
@@ -1406,7 +1418,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -1426,15 +1438,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end valueFunction
+    // $ANTLR end "valueFunction"
 
     public static class functionArgument_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start functionArgument
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:199:1: functionArgument : ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName );
+    // $ANTLR start "functionArgument"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:199: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);
@@ -1456,7 +1468,7 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:200:5: ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:200:5: ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName )
             int alt12=3;
             switch ( input.LA(1) ) {
             case ID:
@@ -1565,7 +1577,7 @@ public class CMISParser extends Parser {
 
             switch (alt12) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:200:9: qualifier DOT columnName
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:200:9: qualifier DOT columnName
                     {
                     pushFollow(FOLLOW_qualifier_in_functionArgument512);
                     qualifier28=qualifier();
@@ -1590,14 +1602,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 201:5: -> ^( COLUMN_REF columnName qualifier )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:201:8: ^( COLUMN_REF columnName qualifier )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:201: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);
@@ -1610,11 +1623,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:202:9: identifier
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:202:9: identifier
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -1628,7 +1641,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 3 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:203:9: literalOrParameterName
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:203:9: literalOrParameterName
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -1660,15 +1673,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end functionArgument
+    // $ANTLR end "functionArgument"
 
     public static class qualifier_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start qualifier
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:206:1: qualifier : ( ( tableName )=> tableName -> tableName | correlationName -> correlationName );
+    // $ANTLR start "qualifier"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:206: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);
@@ -1683,7 +1696,7 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_correlationName=new RewriteRuleSubtreeStream(adaptor,"rule correlationName");
         RewriteRuleSubtreeStream stream_tableName=new RewriteRuleSubtreeStream(adaptor,"rule tableName");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:207:2: ( ( tableName )=> tableName -> tableName | correlationName -> correlationName )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:207:2: ( ( tableName )=> tableName -> tableName | correlationName -> correlationName )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1780,7 +1793,7 @@ public class CMISParser extends Parser {
             }
             switch (alt13) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:207:4: ( tableName )=> tableName
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:207:4: ( tableName )=> tableName
                     {
                     pushFollow(FOLLOW_tableName_in_qualifier571);
                     tableName33=tableName();
@@ -1796,9 +1809,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 208:3: -> tableName
@@ -1807,11 +1821,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:209:5: correlationName
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:209:5: correlationName
                     {
                     pushFollow(FOLLOW_correlationName_in_qualifier583);
                     correlationName34=correlationName();
@@ -1827,9 +1841,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 210:3: -> correlationName
@@ -1838,7 +1853,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -1860,15 +1875,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end qualifier
+    // $ANTLR end "qualifier"
 
     public static class fromClause_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start fromClause
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:213:1: fromClause : FROM tableReference -> tableReference ;
+    // $ANTLR start "fromClause"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:213: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);
@@ -1884,8 +1899,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_tableReference=new RewriteRuleSubtreeStream(adaptor,"rule tableReference");
             paraphrases.push("in from"); 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:216:2: ( FROM tableReference -> tableReference )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:216:4: FROM tableReference
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:216:2: ( FROM tableReference -> tableReference )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:216:4: FROM tableReference
             {
             FROM35=(Token)match(input,FROM,FOLLOW_FROM_in_fromClause620); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_FROM.add(FROM35);
@@ -1904,9 +1919,10 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 217:3: -> tableReference
@@ -1915,7 +1931,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -1938,15 +1954,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end fromClause
+    // $ANTLR end "fromClause"
 
     public static class tableReference_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start tableReference
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:220:1: tableReference : singleTable ( ( joinedTable )=> joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) ;
+    // $ANTLR start "tableReference"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:220:1: tableReference : singleTable ( ( joinedTable )=> 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);
@@ -1961,8 +1977,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_singleTable=new RewriteRuleSubtreeStream(adaptor,"rule singleTable");
         RewriteRuleSubtreeStream stream_joinedTable=new RewriteRuleSubtreeStream(adaptor,"rule joinedTable");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:221:2: ( singleTable ( ( joinedTable )=> joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:221:4: singleTable ( ( joinedTable )=> joinedTable )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:221:2: ( singleTable ( ( joinedTable )=> joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:221:4: singleTable ( ( joinedTable )=> joinedTable )*
             {
             pushFollow(FOLLOW_singleTable_in_tableReference640);
             singleTable37=singleTable();
@@ -1970,7 +1986,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_singleTable.add(singleTable37.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:221:16: ( ( joinedTable )=> joinedTable )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:221:16: ( ( joinedTable )=> joinedTable )*
             loop14:
             do {
                 int alt14=2;
@@ -2013,7 +2029,7 @@ public class CMISParser extends Parser {
 
                 switch (alt14) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:221:17: ( joinedTable )=> joinedTable
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:221:17: ( joinedTable )=> joinedTable
             	    {
             	    pushFollow(FOLLOW_joinedTable_in_tableReference649);
             	    joinedTable38=joinedTable();
@@ -2038,20 +2054,21 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 222:3: -> ^( SOURCE singleTable ( joinedTable )* )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:222:6: ^( SOURCE singleTable ( joinedTable )* )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:222: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:\\workspace-cmis2\\ANTLR\\CMIS.g:222:27: ( joinedTable )*
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:222:27: ( joinedTable )*
                 while ( stream_joinedTable.hasNext() ) {
                     adaptor.addChild(root_1, stream_joinedTable.nextTree());
 
@@ -2063,7 +2080,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -2083,15 +2100,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end tableReference
+    // $ANTLR end "tableReference"
 
     public static class singleTable_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start singleTable
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:228:1: singleTable : ( tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) | LPAREN joinedTables RPAREN -> ^( TABLE joinedTables ) );
+    // $ANTLR start "singleTable"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:228: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);
@@ -2118,7 +2135,7 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_tableName=new RewriteRuleSubtreeStream(adaptor,"rule tableName");
         RewriteRuleSubtreeStream stream_joinedTables=new RewriteRuleSubtreeStream(adaptor,"rule joinedTables");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:229:2: ( tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) | LPAREN joinedTables RPAREN -> ^( TABLE joinedTables ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:229:2: ( tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) | LPAREN joinedTables RPAREN -> ^( TABLE joinedTables ) )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2137,7 +2154,7 @@ public class CMISParser extends Parser {
             }
             switch (alt17) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:229:4: tableName ( ( AS )? correlationName )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:229:4: tableName ( ( AS )? correlationName )?
                     {
                     pushFollow(FOLLOW_tableName_in_singleTable678);
                     tableName39=tableName();
@@ -2145,7 +2162,7 @@ public class CMISParser extends Parser {
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_tableName.add(tableName39.getTree());
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:229:14: ( ( AS )? correlationName )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:229:14: ( ( AS )? correlationName )?
                     int alt16=2;
                     int LA16_0 = input.LA(1);
 
@@ -2154,9 +2171,9 @@ public class CMISParser extends Parser {
                     }
                     switch (alt16) {
                         case 1 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:229:16: ( AS )? correlationName
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:229:16: ( AS )? correlationName
                             {
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:229:16: ( AS )?
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:229:16: ( AS )?
                             int alt15=2;
                             int LA15_0 = input.LA(1);
 
@@ -2165,7 +2182,7 @@ public class CMISParser extends Parser {
                             }
                             switch (alt15) {
                                 case 1 :
-                                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:229:16: AS
+                                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:229:16: AS
                                     {
                                     AS40=(Token)match(input,AS,FOLLOW_AS_in_singleTable682); if (state.failed) return retval; 
                                     if ( state.backtracking==0 ) stream_AS.add(AS40);
@@ -2196,20 +2213,21 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 230:3: -> ^( TABLE_REF tableName ( correlationName )? )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:230:6: ^( TABLE_REF tableName ( correlationName )? )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:230: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:\\workspace-cmis2\\ANTLR\\CMIS.g:230:28: ( correlationName )?
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:230:28: ( correlationName )?
                         if ( stream_correlationName.hasNext() ) {
                             adaptor.addChild(root_1, stream_correlationName.nextTree());
 
@@ -2221,11 +2239,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:231:4: LPAREN joinedTables RPAREN
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:231:4: LPAREN joinedTables RPAREN
                     {
                     LPAREN42=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_singleTable706); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN42);
@@ -2247,14 +2265,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 232:3: -> ^( TABLE joinedTables )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:232:6: ^( TABLE joinedTables )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:232:6: ^( TABLE joinedTables )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(TABLE, "TABLE"), root_1);
@@ -2266,7 +2285,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -2288,15 +2307,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end singleTable
+    // $ANTLR end "singleTable"
 
     public static class joinedTable_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start joinedTable
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:235:1: joinedTable : ( joinType )? JOIN tableReference ( ( joinSpecification )=> joinSpecification )? -> ^( JOIN tableReference ( joinType )? ( joinSpecification )? ) ;
+    // $ANTLR start "joinedTable"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:235:1: joinedTable : ( joinType )? JOIN tableReference ( ( joinSpecification )=> 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);
@@ -2317,10 +2336,10 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_joinType=new RewriteRuleSubtreeStream(adaptor,"rule joinType");
         RewriteRuleSubtreeStream stream_joinSpecification=new RewriteRuleSubtreeStream(adaptor,"rule joinSpecification");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:236:2: ( ( joinType )? JOIN tableReference ( ( joinSpecification )=> joinSpecification )? -> ^( JOIN tableReference ( joinType )? ( joinSpecification )? ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:236:4: ( joinType )? JOIN tableReference ( ( joinSpecification )=> joinSpecification )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:236:2: ( ( joinType )? JOIN tableReference ( ( joinSpecification )=> joinSpecification )? -> ^( JOIN tableReference ( joinType )? ( joinSpecification )? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:236:4: ( joinType )? JOIN tableReference ( ( joinSpecification )=> joinSpecification )?
             {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:236:4: ( joinType )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:236:4: ( joinType )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -2329,7 +2348,7 @@ public class CMISParser extends Parser {
             }
             switch (alt18) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:236:4: joinType
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:236:4: joinType
                     {
                     pushFollow(FOLLOW_joinType_in_joinedTable732);
                     joinType45=joinType();
@@ -2352,7 +2371,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_tableReference.add(tableReference47.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:236:34: ( ( joinSpecification )=> joinSpecification )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:236:34: ( ( joinSpecification )=> joinSpecification )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2365,7 +2384,7 @@ public class CMISParser extends Parser {
             }
             switch (alt19) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:236:35: ( joinSpecification )=> joinSpecification
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:236:35: ( joinSpecification )=> joinSpecification
                     {
                     pushFollow(FOLLOW_joinSpecification_in_joinedTable746);
                     joinSpecification48=joinSpecification();
@@ -2387,26 +2406,27 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 237:3: -> ^( JOIN tableReference ( joinType )? ( joinSpecification )? )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:237:6: ^( JOIN tableReference ( joinType )? ( joinSpecification )? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:237: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:\\workspace-cmis2\\ANTLR\\CMIS.g:237:28: ( joinType )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:237:28: ( joinType )?
                 if ( stream_joinType.hasNext() ) {
                     adaptor.addChild(root_1, stream_joinType.nextTree());
 
                 }
                 stream_joinType.reset();
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:237:38: ( joinSpecification )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:237:38: ( joinSpecification )?
                 if ( stream_joinSpecification.hasNext() ) {
                     adaptor.addChild(root_1, stream_joinSpecification.nextTree());
 
@@ -2418,7 +2438,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -2438,15 +2458,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end joinedTable
+    // $ANTLR end "joinedTable"
 
     public static class joinedTables_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start joinedTables
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:241:1: joinedTables : singleTable ( joinedTable )+ -> ^( SOURCE singleTable ( joinedTable )+ ) ;
+    // $ANTLR start "joinedTables"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:241: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);
@@ -2461,8 +2481,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_singleTable=new RewriteRuleSubtreeStream(adaptor,"rule singleTable");
         RewriteRuleSubtreeStream stream_joinedTable=new RewriteRuleSubtreeStream(adaptor,"rule joinedTable");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:242:2: ( singleTable ( joinedTable )+ -> ^( SOURCE singleTable ( joinedTable )+ ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:242:4: singleTable ( joinedTable )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:242:2: ( singleTable ( joinedTable )+ -> ^( SOURCE singleTable ( joinedTable )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:242:4: singleTable ( joinedTable )+
             {
             pushFollow(FOLLOW_singleTable_in_joinedTables777);
             singleTable49=singleTable();
@@ -2470,7 +2490,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_singleTable.add(singleTable49.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:242:16: ( joinedTable )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:242:16: ( joinedTable )+
             int cnt20=0;
             loop20:
             do {
@@ -2484,7 +2504,7 @@ public class CMISParser extends Parser {
 
                 switch (alt20) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:242:16: joinedTable
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:242:16: joinedTable
             	    {
             	    pushFollow(FOLLOW_joinedTable_in_joinedTables779);
             	    joinedTable50=joinedTable();
@@ -2509,19 +2529,20 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: singleTable, joinedTable
+            // elements: joinedTable, singleTable
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 243:3: -> ^( SOURCE singleTable ( joinedTable )+ )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:243:6: ^( SOURCE singleTable ( joinedTable )+ )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:243:6: ^( SOURCE singleTable ( joinedTable )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SOURCE, "SOURCE"), root_1);
@@ -2541,7 +2562,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -2561,15 +2582,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end joinedTables
+    // $ANTLR end "joinedTables"
 
     public static class joinType_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start joinType
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:246:1: joinType : ( INNER -> INNER | LEFT ( OUTER )? -> LEFT );
+    // $ANTLR start "joinType"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:246: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);
@@ -2588,7 +2609,7 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_LEFT=new RewriteRuleTokenStream(adaptor,"token LEFT");
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:247:2: ( INNER -> INNER | LEFT ( OUTER )? -> LEFT )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:247:2: ( INNER -> INNER | LEFT ( OUTER )? -> LEFT )
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -2607,7 +2628,7 @@ public class CMISParser extends Parser {
             }
             switch (alt22) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:247:4: INNER
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:247:4: INNER
                     {
                     INNER51=(Token)match(input,INNER,FOLLOW_INNER_in_joinType806); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_INNER.add(INNER51);
@@ -2620,9 +2641,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 248:3: -> INNER
@@ -2631,16 +2653,16 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:249:5: LEFT ( OUTER )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:249:5: LEFT ( OUTER )?
                     {
                     LEFT52=(Token)match(input,LEFT,FOLLOW_LEFT_in_joinType818); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_LEFT.add(LEFT52);
 
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:249:10: ( OUTER )?
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:249:10: ( OUTER )?
                     int alt21=2;
                     int LA21_0 = input.LA(1);
 
@@ -2649,7 +2671,7 @@ public class CMISParser extends Parser {
                     }
                     switch (alt21) {
                         case 1 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:249:10: OUTER
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:249:10: OUTER
                             {
                             OUTER53=(Token)match(input,OUTER,FOLLOW_OUTER_in_joinType820); if (state.failed) return retval; 
                             if ( state.backtracking==0 ) stream_OUTER.add(OUTER53);
@@ -2668,9 +2690,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 250:3: -> LEFT
@@ -2679,7 +2702,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -2701,15 +2724,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end joinType
+    // $ANTLR end "joinType"
 
     public static class joinSpecification_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start joinSpecification
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:253:1: joinSpecification : ON LPAREN lhs= columnReference EQUALS rhs= columnReference RPAREN -> ^( ON $lhs EQUALS $rhs) ;
+    // $ANTLR start "joinSpecification"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:253:1: joinSpecification : ON LPAREN lhs= columnReference EQUALS rhs= columnReference RPAREN -> ^( 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);
@@ -2735,8 +2758,8 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:254:2: ( ON LPAREN lhs= columnReference EQUALS rhs= columnReference RPAREN -> ^( ON $lhs EQUALS $rhs) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:254:4: ON LPAREN lhs= columnReference EQUALS rhs= columnReference RPAREN
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:254:2: ( ON LPAREN lhs= columnReference EQUALS rhs= columnReference RPAREN -> ^( ON $lhs EQUALS $rhs) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:254:4: ON LPAREN lhs= columnReference EQUALS rhs= columnReference RPAREN
             {
             ON54=(Token)match(input,ON,FOLLOW_ON_in_joinSpecification840); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_ON.add(ON54);
@@ -2765,21 +2788,22 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: rhs, ON, EQUALS, lhs
+            // elements: rhs, EQUALS, ON, lhs
             // token labels: 
             // rule labels: retval, rhs, lhs
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             if ( state.backtracking==0 ) {
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
-            RewriteRuleSubtreeStream stream_rhs=new RewriteRuleSubtreeStream(adaptor,"token rhs",rhs!=null?rhs.tree:null);
-            RewriteRuleSubtreeStream stream_lhs=new RewriteRuleSubtreeStream(adaptor,"token lhs",lhs!=null?lhs.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_rhs=new RewriteRuleSubtreeStream(adaptor,"rule rhs",rhs!=null?rhs.tree:null);
+            RewriteRuleSubtreeStream stream_lhs=new RewriteRuleSubtreeStream(adaptor,"rule lhs",lhs!=null?lhs.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 255:3: -> ^( ON $lhs EQUALS $rhs)
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:255:6: ^( ON $lhs EQUALS $rhs)
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:255:6: ^( ON $lhs EQUALS $rhs)
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_ON.nextNode(), root_1);
@@ -2793,7 +2817,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -2813,15 +2837,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end joinSpecification
+    // $ANTLR end "joinSpecification"
 
     public static class whereClause_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start whereClause
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:262:1: whereClause : WHERE searchOrCondition -> searchOrCondition ;
+    // $ANTLR start "whereClause"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:262: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);
@@ -2837,8 +2861,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_searchOrCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchOrCondition");
             paraphrases.push("in where"); 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:265:2: ( WHERE searchOrCondition -> searchOrCondition )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:265:4: WHERE searchOrCondition
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:265:2: ( WHERE searchOrCondition -> searchOrCondition )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:265:4: WHERE searchOrCondition
             {
             WHERE58=(Token)match(input,WHERE,FOLLOW_WHERE_in_whereClause904); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_WHERE.add(WHERE58);
@@ -2857,9 +2881,10 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 266:3: -> searchOrCondition
@@ -2868,7 +2893,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -2891,15 +2916,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end whereClause
+    // $ANTLR end "whereClause"
 
     public static class searchOrCondition_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start searchOrCondition
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:269:1: searchOrCondition : searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) ;
+    // $ANTLR start "searchOrCondition"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:269: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);
@@ -2916,8 +2941,8 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_OR=new RewriteRuleTokenStream(adaptor,"token OR");
         RewriteRuleSubtreeStream stream_searchAndCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchAndCondition");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:273:2: ( searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:273:4: searchAndCondition ( OR searchAndCondition )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:273:2: ( searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:273:4: searchAndCondition ( OR searchAndCondition )*
             {
             pushFollow(FOLLOW_searchAndCondition_in_searchOrCondition926);
             searchAndCondition60=searchAndCondition();
@@ -2925,7 +2950,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_searchAndCondition.add(searchAndCondition60.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:273:23: ( OR searchAndCondition )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:273:23: ( OR searchAndCondition )*
             loop23:
             do {
                 int alt23=2;
@@ -2938,7 +2963,7 @@ public class CMISParser extends Parser {
 
                 switch (alt23) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:273:24: OR searchAndCondition
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:273:24: OR searchAndCondition
             	    {
             	    OR61=(Token)match(input,OR,FOLLOW_OR_in_searchOrCondition929); if (state.failed) return retval; 
             	    if ( state.backtracking==0 ) stream_OR.add(OR61);
@@ -2966,14 +2991,15 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 274:3: -> ^( DISJUNCTION ( searchAndCondition )+ )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:274:6: ^( DISJUNCTION ( searchAndCondition )+ )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:274:6: ^( DISJUNCTION ( searchAndCondition )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DISJUNCTION, "DISJUNCTION"), root_1);
@@ -2992,7 +3018,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -3012,15 +3038,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end searchOrCondition
+    // $ANTLR end "searchOrCondition"
 
     public static class searchAndCondition_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start searchAndCondition
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:278:1: searchAndCondition : searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) ;
+    // $ANTLR start "searchAndCondition"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:278: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);
@@ -3037,8 +3063,8 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_AND=new RewriteRuleTokenStream(adaptor,"token AND");
         RewriteRuleSubtreeStream stream_searchNotCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchNotCondition");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:282:2: ( searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:282:4: searchNotCondition ( AND searchNotCondition )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:282:2: ( searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:282:4: searchNotCondition ( AND searchNotCondition )*
             {
             pushFollow(FOLLOW_searchNotCondition_in_searchAndCondition959);
             searchNotCondition63=searchNotCondition();
@@ -3046,7 +3072,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_searchNotCondition.add(searchNotCondition63.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:282:23: ( AND searchNotCondition )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:282:23: ( AND searchNotCondition )*
             loop24:
             do {
                 int alt24=2;
@@ -3059,7 +3085,7 @@ public class CMISParser extends Parser {
 
                 switch (alt24) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:282:24: AND searchNotCondition
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:282:24: AND searchNotCondition
             	    {
             	    AND64=(Token)match(input,AND,FOLLOW_AND_in_searchAndCondition962); if (state.failed) return retval; 
             	    if ( state.backtracking==0 ) stream_AND.add(AND64);
@@ -3087,14 +3113,15 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 283:3: -> ^( CONJUNCTION ( searchNotCondition )+ )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:283:6: ^( CONJUNCTION ( searchNotCondition )+ )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:283:6: ^( CONJUNCTION ( searchNotCondition )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(CONJUNCTION, "CONJUNCTION"), root_1);
@@ -3113,7 +3140,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -3133,15 +3160,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end searchAndCondition
+    // $ANTLR end "searchAndCondition"
 
     public static class searchNotCondition_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start searchNotCondition
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:286:1: searchNotCondition : ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest );
+    // $ANTLR start "searchNotCondition"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:286: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);
@@ -3158,12 +3185,12 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
         RewriteRuleSubtreeStream stream_searchTest=new RewriteRuleSubtreeStream(adaptor,"rule searchTest");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:287:2: ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:287:2: ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest )
             int alt25=2;
             alt25 = dfa25.predict(input);
             switch (alt25) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:287:4: NOT searchTest
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:287:4: NOT searchTest
                     {
                     NOT66=(Token)match(input,NOT,FOLLOW_NOT_in_searchNotCondition991); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_NOT.add(NOT66);
@@ -3182,14 +3209,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 288:3: -> ^( NEGATION searchTest )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:288:6: ^( NEGATION searchTest )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:288:6: ^( NEGATION searchTest )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(NEGATION, "NEGATION"), root_1);
@@ -3201,11 +3229,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:289:4: searchTest
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:289:4: searchTest
                     {
                     pushFollow(FOLLOW_searchTest_in_searchNotCondition1008);
                     searchTest68=searchTest();
@@ -3221,9 +3249,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 290:3: -> searchTest
@@ -3232,7 +3261,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -3254,15 +3283,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end searchNotCondition
+    // $ANTLR end "searchNotCondition"
 
     public static class searchTest_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start searchTest
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:293:1: searchTest : ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition );
+    // $ANTLR start "searchTest"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:293: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);
@@ -3283,7 +3312,7 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_predicate=new RewriteRuleSubtreeStream(adaptor,"rule predicate");
         RewriteRuleSubtreeStream stream_searchOrCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchOrCondition");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:294:2: ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:294:2: ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -3302,7 +3331,7 @@ public class CMISParser extends Parser {
             }
             switch (alt26) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:294:4: predicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:294:4: predicate
                     {
                     pushFollow(FOLLOW_predicate_in_searchTest1026);
                     predicate69=predicate();
@@ -3318,9 +3347,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 295:3: -> predicate
@@ -3329,11 +3359,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:296:4: LPAREN searchOrCondition RPAREN
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:296:4: LPAREN searchOrCondition RPAREN
                     {
                     LPAREN70=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_searchTest1037); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN70);
@@ -3355,9 +3385,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 297:3: -> searchOrCondition
@@ -3366,7 +3397,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -3388,15 +3419,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end searchTest
+    // $ANTLR end "searchTest"
 
     public static class predicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start predicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:300:1: predicate : ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate );
+    // $ANTLR start "predicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:300: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);
@@ -3422,12 +3453,12 @@ public class CMISParser extends Parser {
 
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:301:2: ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:301:2: ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate )
             int alt27=8;
             alt27 = dfa27.predict(input);
             switch (alt27) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:301:4: comparisonPredicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:301:4: comparisonPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3441,7 +3472,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:302:4: inPredicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:302:4: inPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3455,7 +3486,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 3 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:303:4: likePredicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:303:4: likePredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3469,7 +3500,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 4 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:304:4: nullPredicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:304:4: nullPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3483,7 +3514,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 5 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:305:5: quantifiedComparisonPredicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:305:5: quantifiedComparisonPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3497,7 +3528,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 6 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:306:4: quantifiedInPredicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:306:4: quantifiedInPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3511,7 +3542,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 7 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:307:4: textSearchPredicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:307:4: textSearchPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3525,7 +3556,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 8 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:308:4: folderPredicate
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:308:4: folderPredicate
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3557,15 +3588,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end predicate
+    // $ANTLR end "predicate"
 
     public static class comparisonPredicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start comparisonPredicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:311:1: comparisonPredicate : valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName ) ;
+    // $ANTLR start "comparisonPredicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:311: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);
@@ -3583,8 +3614,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_compOp=new RewriteRuleSubtreeStream(adaptor,"rule compOp");
         RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:312:2: ( valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:312:4: valueExpression compOp literalOrParameterName
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:312:2: ( valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:312:4: valueExpression compOp literalOrParameterName
             {
             pushFollow(FOLLOW_valueExpression_in_comparisonPredicate1106);
             valueExpression81=valueExpression();
@@ -3607,19 +3638,20 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: literalOrParameterName, compOp, valueExpression
+            // elements: valueExpression, compOp, literalOrParameterName
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 313:3: -> ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:313:6: ^( PRED_COMPARISON ANY valueExpression compOp literalOrParameterName )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313: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);
@@ -3634,7 +3666,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -3654,15 +3686,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end comparisonPredicate
+    // $ANTLR end "comparisonPredicate"
 
     public static class compOp_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start compOp
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:316:1: compOp : ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS );
+    // $ANTLR start "compOp"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:316: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);
@@ -3674,8 +3706,8 @@ public class CMISParser extends Parser {
         Object set84_tree=null;
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:317:2: ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:317:2: ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
             {
             root_0 = (Object)adaptor.nil();
 
@@ -3711,15 +3743,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end compOp
+    // $ANTLR end "compOp"
 
     public static class literalOrParameterName_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start literalOrParameterName
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:325:1: literalOrParameterName : ( literal | parameterName );
+    // $ANTLR start "literalOrParameterName"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:325: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);
@@ -3733,7 +3765,7 @@ public class CMISParser extends Parser {
 
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:326:2: ( literal | parameterName )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:326:2: ( literal | parameterName )
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -3752,7 +3784,7 @@ public class CMISParser extends Parser {
             }
             switch (alt28) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:326:4: literal
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:326:4: literal
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3766,7 +3798,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:327:4: parameterName
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:327:4: parameterName
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3798,15 +3830,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end literalOrParameterName
+    // $ANTLR end "literalOrParameterName"
 
     public static class literal_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start literal
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:330:1: literal : ( signedNumericLiteral | characterStringLiteral );
+    // $ANTLR start "literal"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:330:1: literal : ( signedNumericLiteral | characterStringLiteral );
     public final CMISParser.literal_return literal() throws RecognitionException {
         CMISParser.literal_return retval = new CMISParser.literal_return();
         retval.start = input.LT(1);
@@ -3820,7 +3852,7 @@ public class CMISParser extends Parser {
 
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:331:2: ( signedNumericLiteral | characterStringLiteral )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:331:2: ( signedNumericLiteral | characterStringLiteral )
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -3839,7 +3871,7 @@ public class CMISParser extends Parser {
             }
             switch (alt29) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:331:4: signedNumericLiteral
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:331:4: signedNumericLiteral
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3853,7 +3885,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:332:4: characterStringLiteral
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:332:4: characterStringLiteral
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -3885,15 +3917,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end literal
+    // $ANTLR end "literal"
 
     public static class inPredicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start inPredicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:335:1: inPredicate : columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) ;
+    // $ANTLR start "inPredicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:335: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);
@@ -3920,8 +3952,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         RewriteRuleSubtreeStream stream_inValueList=new RewriteRuleSubtreeStream(adaptor,"rule inValueList");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:336:2: ( columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:336:4: columnReference ( NOT )? IN LPAREN inValueList RPAREN
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:336:2: ( columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:336:4: columnReference ( NOT )? IN LPAREN inValueList RPAREN
             {
             pushFollow(FOLLOW_columnReference_in_inPredicate1211);
             columnReference89=columnReference();
@@ -3929,7 +3961,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_columnReference.add(columnReference89.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:336:20: ( NOT )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:336:20: ( NOT )?
             int alt30=2;
             int LA30_0 = input.LA(1);
 
@@ -3938,7 +3970,7 @@ public class CMISParser extends Parser {
             }
             switch (alt30) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:336:20: NOT
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:336:20: NOT
                     {
                     NOT90=(Token)match(input,NOT,FOLLOW_NOT_in_inPredicate1213); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_NOT.add(NOT90);
@@ -3967,19 +3999,20 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: inValueList, NOT, columnReference
+            // elements: columnReference, inValueList, NOT
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 337:3: -> ^( PRED_IN ANY columnReference inValueList ( NOT )? )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:337:6: ^( PRED_IN ANY columnReference inValueList ( NOT )? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:337: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);
@@ -3987,7 +4020,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:\\workspace-cmis2\\ANTLR\\CMIS.g:337:48: ( NOT )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:337:48: ( NOT )?
                 if ( stream_NOT.hasNext() ) {
                     adaptor.addChild(root_1, stream_NOT.nextNode());
 
@@ -3999,7 +4032,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -4019,15 +4052,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end inPredicate
+    // $ANTLR end "inPredicate"
 
     public static class inValueList_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start inValueList
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:340:1: inValueList : literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) ;
+    // $ANTLR start "inValueList"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:340: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);
@@ -4044,8 +4077,8 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:341:2: ( literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:341:4: literalOrParameterName ( COMMA literalOrParameterName )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:341:2: ( literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:341:4: literalOrParameterName ( COMMA literalOrParameterName )*
             {
             pushFollow(FOLLOW_literalOrParameterName_in_inValueList1251);
             literalOrParameterName95=literalOrParameterName();
@@ -4053,7 +4086,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName95.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:341:27: ( COMMA literalOrParameterName )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:341:27: ( COMMA literalOrParameterName )*
             loop31:
             do {
                 int alt31=2;
@@ -4066,7 +4099,7 @@ public class CMISParser extends Parser {
 
                 switch (alt31) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:341:28: COMMA literalOrParameterName
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:341:28: COMMA literalOrParameterName
             	    {
             	    COMMA96=(Token)match(input,COMMA,FOLLOW_COMMA_in_inValueList1254); if (state.failed) return retval; 
             	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA96);
@@ -4094,14 +4127,15 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 342:3: -> ^( LIST ( literalOrParameterName )+ )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:342:6: ^( LIST ( literalOrParameterName )+ )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:342:6: ^( LIST ( literalOrParameterName )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(LIST, "LIST"), root_1);
@@ -4120,7 +4154,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -4140,15 +4174,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end inValueList
+    // $ANTLR end "inValueList"
 
     public static class likePredicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start likePredicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:345:1: likePredicate : columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) ;
+    // $ANTLR start "likePredicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:345: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);
@@ -4169,8 +4203,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         RewriteRuleSubtreeStream stream_characterStringLiteral=new RewriteRuleSubtreeStream(adaptor,"rule characterStringLiteral");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:346:2: ( columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:346:4: columnReference ( NOT )? LIKE characterStringLiteral
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:346:2: ( columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:346:4: columnReference ( NOT )? LIKE characterStringLiteral
             {
             pushFollow(FOLLOW_columnReference_in_likePredicate1282);
             columnReference98=columnReference();
@@ -4178,7 +4212,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_columnReference.add(columnReference98.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:346:20: ( NOT )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:346:20: ( NOT )?
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -4187,7 +4221,7 @@ public class CMISParser extends Parser {
             }
             switch (alt32) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:346:20: NOT
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:346:20: NOT
                     {
                     NOT99=(Token)match(input,NOT,FOLLOW_NOT_in_likePredicate1284); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_NOT.add(NOT99);
@@ -4210,26 +4244,27 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: NOT, columnReference, characterStringLiteral
+            // elements: characterStringLiteral, columnReference, NOT
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 347:3: -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:347:6: ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:347: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:\\workspace-cmis2\\ANTLR\\CMIS.g:347:57: ( NOT )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:347:57: ( NOT )?
                 if ( stream_NOT.hasNext() ) {
                     adaptor.addChild(root_1, stream_NOT.nextNode());
 
@@ -4241,7 +4276,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -4261,15 +4296,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end likePredicate
+    // $ANTLR end "likePredicate"
 
     public static class nullPredicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start nullPredicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:350:1: nullPredicate : ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) );
+    // $ANTLR start "nullPredicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:350: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);
@@ -4301,14 +4336,14 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         RewriteRuleSubtreeStream stream_multiValuedColumnReference=new RewriteRuleSubtreeStream(adaptor,"rule multiValuedColumnReference");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:351:2: ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:351:2: ( ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL -> ^( PRED_EXISTS columnReference NOT ) | ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL -> ^( PRED_EXISTS columnReference ) )
             int alt35=2;
             alt35 = dfa35.predict(input);
             switch (alt35) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:351:4: ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:351:4: ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NULL
                     {
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:351:4: ( ( columnReference )=> columnReference | multiValuedColumnReference )
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:351:4: ( ( columnReference )=> columnReference | multiValuedColumnReference )
                     int alt33=2;
                     int LA33_0 = input.LA(1);
 
@@ -4405,7 +4440,7 @@ public class CMISParser extends Parser {
                     }
                     switch (alt33) {
                         case 1 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:351:6: ( columnReference )=> columnReference
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:351:6: ( columnReference )=> columnReference
                             {
                             pushFollow(FOLLOW_columnReference_in_nullPredicate1323);
                             columnReference102=columnReference();
@@ -4417,7 +4452,7 @@ public class CMISParser extends Parser {
                             }
                             break;
                         case 2 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:351:44: multiValuedColumnReference
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:351:44: multiValuedColumnReference
                             {
                             pushFollow(FOLLOW_multiValuedColumnReference_in_nullPredicate1327);
                             multiValuedColumnReference103=multiValuedColumnReference();
@@ -4445,14 +4480,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 352:3: -> ^( PRED_EXISTS columnReference NOT )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:352:6: ^( PRED_EXISTS columnReference NOT )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:352: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);
@@ -4465,13 +4501,13 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:353:9: ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:9: ( ( columnReference )=> columnReference | multiValuedColumnReference ) IS NOT NULL
                     {
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:353:9: ( ( columnReference )=> columnReference | multiValuedColumnReference )
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:9: ( ( columnReference )=> columnReference | multiValuedColumnReference )
                     int alt34=2;
                     int LA34_0 = input.LA(1);
 
@@ -4568,7 +4604,7 @@ public class CMISParser extends Parser {
                     }
                     switch (alt34) {
                         case 1 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:353:11: ( columnReference )=> columnReference
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:11: ( columnReference )=> columnReference
                             {
                             pushFollow(FOLLOW_columnReference_in_nullPredicate1361);
                             columnReference106=columnReference();
@@ -4580,7 +4616,7 @@ public class CMISParser extends Parser {
                             }
                             break;
                         case 2 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:353:49: multiValuedColumnReference
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:49: multiValuedColumnReference
                             {
                             pushFollow(FOLLOW_multiValuedColumnReference_in_nullPredicate1365);
                             multiValuedColumnReference107=multiValuedColumnReference();
@@ -4611,14 +4647,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 354:9: -> ^( PRED_EXISTS columnReference )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:354:12: ^( PRED_EXISTS columnReference )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:12: ^( PRED_EXISTS columnReference )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_EXISTS, "PRED_EXISTS"), root_1);
@@ -4630,7 +4667,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -4652,15 +4689,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end nullPredicate
+    // $ANTLR end "nullPredicate"
 
     public static class quantifiedComparisonPredicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start quantifiedComparisonPredicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:357:1: quantifiedComparisonPredicate : literalOrParameterName compOp ANY multiValuedColumnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference ) ;
+    // $ANTLR start "quantifiedComparisonPredicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:357: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);
@@ -4681,8 +4718,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
         RewriteRuleSubtreeStream stream_multiValuedColumnReference=new RewriteRuleSubtreeStream(adaptor,"rule multiValuedColumnReference");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:358:2: ( literalOrParameterName compOp ANY multiValuedColumnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:358:4: literalOrParameterName compOp ANY multiValuedColumnReference
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:358:2: ( literalOrParameterName compOp ANY multiValuedColumnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:358:4: literalOrParameterName compOp ANY multiValuedColumnReference
             {
             pushFollow(FOLLOW_literalOrParameterName_in_quantifiedComparisonPredicate1400);
             literalOrParameterName111=literalOrParameterName();
@@ -4708,19 +4745,20 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: multiValuedColumnReference, ANY, compOp, literalOrParameterName
+            // elements: multiValuedColumnReference, compOp, literalOrParameterName, ANY
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 359:2: -> ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:359:5: ^( PRED_COMPARISON ANY literalOrParameterName compOp multiValuedColumnReference )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:359: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);
@@ -4735,7 +4773,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -4755,15 +4793,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end quantifiedComparisonPredicate
+    // $ANTLR end "quantifiedComparisonPredicate"
 
     public static class quantifiedInPredicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start quantifiedInPredicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:363:1: quantifiedInPredicate : ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? ) ;
+    // $ANTLR start "quantifiedInPredicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:363: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);
@@ -4793,8 +4831,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_multiValuedColumnReference=new RewriteRuleSubtreeStream(adaptor,"rule multiValuedColumnReference");
         RewriteRuleSubtreeStream stream_inValueList=new RewriteRuleSubtreeStream(adaptor,"rule inValueList");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:364:2: ( ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:364:4: ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:2: ( ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:4: ANY multiValuedColumnReference ( NOT )? IN LPAREN inValueList RPAREN
             {
             ANY115=(Token)match(input,ANY,FOLLOW_ANY_in_quantifiedInPredicate1435); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_ANY.add(ANY115);
@@ -4805,7 +4843,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_multiValuedColumnReference.add(multiValuedColumnReference116.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:364:35: ( NOT )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:35: ( NOT )?
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -4814,7 +4852,7 @@ public class CMISParser extends Parser {
             }
             switch (alt36) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:364:35: NOT
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:364:35: NOT
                     {
                     NOT117=(Token)match(input,NOT,FOLLOW_NOT_in_quantifiedInPredicate1439); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_NOT.add(NOT117);
@@ -4843,19 +4881,20 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: ANY, multiValuedColumnReference, NOT, inValueList
+            // elements: NOT, multiValuedColumnReference, inValueList, ANY
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 365:3: -> ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:365:6: ^( PRED_IN ANY multiValuedColumnReference inValueList ( NOT )? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:365: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);
@@ -4863,7 +4902,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:\\workspace-cmis2\\ANTLR\\CMIS.g:365:59: ( NOT )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:365:59: ( NOT )?
                 if ( stream_NOT.hasNext() ) {
                     adaptor.addChild(root_1, stream_NOT.nextNode());
 
@@ -4875,7 +4914,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -4895,15 +4934,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end quantifiedInPredicate
+    // $ANTLR end "quantifiedInPredicate"
 
     public static class textSearchPredicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start textSearchPredicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:368:1: textSearchPredicate : CONTAINS LPAREN ( qualifier COMMA | COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) ;
+    // $ANTLR start "textSearchPredicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:368:1: textSearchPredicate : CONTAINS LPAREN ( qualifier COMMA | 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);
@@ -4932,8 +4971,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         RewriteRuleSubtreeStream stream_textSearchExpression=new RewriteRuleSubtreeStream(adaptor,"rule textSearchExpression");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:369:2: ( CONTAINS LPAREN ( qualifier COMMA | COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:369:4: CONTAINS LPAREN ( qualifier COMMA | COMMA )? textSearchExpression RPAREN
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:2: ( CONTAINS LPAREN ( qualifier COMMA | COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:4: CONTAINS LPAREN ( qualifier COMMA | COMMA )? textSearchExpression RPAREN
             {
             CONTAINS122=(Token)match(input,CONTAINS,FOLLOW_CONTAINS_in_textSearchPredicate1478); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_CONTAINS.add(CONTAINS122);
@@ -4941,7 +4980,7 @@ public class CMISParser extends Parser {
             LPAREN123=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_textSearchPredicate1480); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN123);
 
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:369:20: ( qualifier COMMA | COMMA )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:20: ( qualifier COMMA | COMMA )?
             int alt37=3;
             int LA37_0 = input.LA(1);
 
@@ -4953,7 +4992,7 @@ public class CMISParser extends Parser {
             }
             switch (alt37) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:369:21: qualifier COMMA
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:21: qualifier COMMA
                     {
                     pushFollow(FOLLOW_qualifier_in_textSearchPredicate1483);
                     qualifier124=qualifier();
@@ -4968,7 +5007,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:369:39: COMMA
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:39: COMMA
                     {
                     COMMA126=(Token)match(input,COMMA,FOLLOW_COMMA_in_textSearchPredicate1489); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_COMMA.add(COMMA126);
@@ -4991,25 +5030,26 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: textSearchExpression, qualifier
+            // elements: qualifier, textSearchExpression
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 370:3: -> ^( PRED_FTS textSearchExpression ( qualifier )? )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:370:6: ^( PRED_FTS textSearchExpression ( qualifier )? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:370: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:\\workspace-cmis2\\ANTLR\\CMIS.g:370:38: ( qualifier )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:370:38: ( qualifier )?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_1, stream_qualifier.nextTree());
 
@@ -5021,7 +5061,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -5041,15 +5081,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end textSearchPredicate
+    // $ANTLR end "textSearchPredicate"
 
     public static class folderPredicate_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start folderPredicate
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:373:1: folderPredicate : ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) );
+    // $ANTLR start "folderPredicate"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:373: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);
@@ -5069,7 +5109,7 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_IN_FOLDER=new RewriteRuleTokenStream(adaptor,"token IN_FOLDER");
         RewriteRuleSubtreeStream stream_folderPredicateArgs=new RewriteRuleSubtreeStream(adaptor,"rule folderPredicateArgs");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:374:2: ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:374:2: ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) )
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -5088,7 +5128,7 @@ public class CMISParser extends Parser {
             }
             switch (alt38) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:374:4: IN_FOLDER folderPredicateArgs
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:374:4: IN_FOLDER folderPredicateArgs
                     {
                     IN_FOLDER129=(Token)match(input,IN_FOLDER,FOLLOW_IN_FOLDER_in_folderPredicate1520); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_IN_FOLDER.add(IN_FOLDER129);
@@ -5107,14 +5147,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 375:3: -> ^( PRED_CHILD folderPredicateArgs )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:375:6: ^( PRED_CHILD folderPredicateArgs )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:375:6: ^( PRED_CHILD folderPredicateArgs )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_CHILD, "PRED_CHILD"), root_1);
@@ -5126,11 +5167,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:376:10: IN_TREE folderPredicateArgs
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:376:10: IN_TREE folderPredicateArgs
                     {
                     IN_TREE131=(Token)match(input,IN_TREE,FOLLOW_IN_TREE_in_folderPredicate1544); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_IN_TREE.add(IN_TREE131);
@@ -5149,14 +5190,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 377:3: -> ^( PRED_DESCENDANT folderPredicateArgs )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:377:6: ^( PRED_DESCENDANT folderPredicateArgs )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:377:6: ^( PRED_DESCENDANT folderPredicateArgs )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_DESCENDANT, "PRED_DESCENDANT"), root_1);
@@ -5168,7 +5210,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -5190,15 +5232,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end folderPredicate
+    // $ANTLR end "folderPredicate"
 
     public static class folderPredicateArgs_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start folderPredicateArgs
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:380:1: folderPredicateArgs : LPAREN ( qualifier COMMA | COMMA )? folderId RPAREN -> folderId ( qualifier )? ;
+    // $ANTLR start "folderPredicateArgs"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:380:1: folderPredicateArgs : LPAREN ( qualifier COMMA | 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);
@@ -5224,13 +5266,13 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
         RewriteRuleSubtreeStream stream_folderId=new RewriteRuleSubtreeStream(adaptor,"rule folderId");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:381:2: ( LPAREN ( qualifier COMMA | COMMA )? folderId RPAREN -> folderId ( qualifier )? )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:381:4: LPAREN ( qualifier COMMA | COMMA )? folderId RPAREN
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:2: ( LPAREN ( qualifier COMMA | COMMA )? folderId RPAREN -> folderId ( qualifier )? )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:4: LPAREN ( qualifier COMMA | COMMA )? folderId RPAREN
             {
             LPAREN133=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_folderPredicateArgs1568); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN133);
 
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:381:11: ( qualifier COMMA | COMMA )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:11: ( qualifier COMMA | COMMA )?
             int alt39=3;
             int LA39_0 = input.LA(1);
 
@@ -5242,7 +5284,7 @@ public class CMISParser extends Parser {
             }
             switch (alt39) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:381:12: qualifier COMMA
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:12: qualifier COMMA
                     {
                     pushFollow(FOLLOW_qualifier_in_folderPredicateArgs1571);
                     qualifier134=qualifier();
@@ -5257,7 +5299,7 @@ public class CMISParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:381:30: COMMA
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:30: COMMA
                     {
                     COMMA136=(Token)match(input,COMMA,FOLLOW_COMMA_in_folderPredicateArgs1577); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_COMMA.add(COMMA136);
@@ -5280,20 +5322,21 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: qualifier, folderId
+            // elements: folderId, qualifier
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 382:3: -> folderId ( qualifier )?
             {
                 adaptor.addChild(root_0, stream_folderId.nextTree());
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:382:15: ( qualifier )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:382:15: ( qualifier )?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_0, stream_qualifier.nextTree());
 
@@ -5302,7 +5345,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -5322,15 +5365,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end folderPredicateArgs
+    // $ANTLR end "folderPredicateArgs"
 
     public static class orderByClause_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start orderByClause
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:385:1: orderByClause : ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) ;
+    // $ANTLR start "orderByClause"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:385: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);
@@ -5354,8 +5397,8 @@ public class CMISParser extends Parser {
         RewriteRuleSubtreeStream stream_sortSpecification=new RewriteRuleSubtreeStream(adaptor,"rule sortSpecification");
             paraphrases.push("in order by"); 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:388:2: ( ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:388:4: ORDER BY sortSpecification ( COMMA sortSpecification )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:2: ( ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:4: ORDER BY sortSpecification ( COMMA sortSpecification )*
             {
             ORDER139=(Token)match(input,ORDER,FOLLOW_ORDER_in_orderByClause1622); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_ORDER.add(ORDER139);
@@ -5369,7 +5412,7 @@ public class CMISParser extends Parser {
             state._fsp--;
             if (state.failed) return retval;
             if ( state.backtracking==0 ) stream_sortSpecification.add(sortSpecification141.getTree());
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:388:31: ( COMMA sortSpecification )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:31: ( COMMA sortSpecification )*
             loop40:
             do {
                 int alt40=2;
@@ -5382,7 +5425,7 @@ public class CMISParser extends Parser {
 
                 switch (alt40) {
             	case 1 :
-            	    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:388:33: COMMA sortSpecification
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:33: COMMA sortSpecification
             	    {
             	    COMMA142=(Token)match(input,COMMA,FOLLOW_COMMA_in_orderByClause1630); if (state.failed) return retval; 
             	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA142);
@@ -5410,14 +5453,15 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 389:3: -> ^( ORDER ( sortSpecification )+ )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:389:6: ^( ORDER ( sortSpecification )+ )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:389:6: ^( ORDER ( sortSpecification )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_ORDER.nextNode(), root_1);
@@ -5436,7 +5480,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -5459,15 +5503,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end orderByClause
+    // $ANTLR end "orderByClause"
 
     public static class sortSpecification_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start sortSpecification
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:392:1: sortSpecification : ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) );
+    // $ANTLR start "sortSpecification"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:392: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);
@@ -5485,12 +5529,12 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_DESC=new RewriteRuleTokenStream(adaptor,"token DESC");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:393:2: ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:393:2: ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) )
             int alt42=2;
             alt42 = dfa42.predict(input);
             switch (alt42) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:393:4: columnReference
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:393:4: columnReference
                     {
                     pushFollow(FOLLOW_columnReference_in_sortSpecification1658);
                     columnReference144=columnReference();
@@ -5506,14 +5550,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 394:3: -> ^( SORT_SPECIFICATION columnReference ASC )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:394:6: ^( SORT_SPECIFICATION columnReference ASC )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:394: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);
@@ -5526,11 +5571,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:395:4: columnReference (by= ASC | by= DESC )
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:395:4: columnReference (by= ASC | by= DESC )
                     {
                     pushFollow(FOLLOW_columnReference_in_sortSpecification1676);
                     columnReference145=columnReference();
@@ -5538,7 +5583,7 @@ public class CMISParser extends Parser {
                     state._fsp--;
                     if (state.failed) return retval;
                     if ( state.backtracking==0 ) stream_columnReference.add(columnReference145.getTree());
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:395:20: (by= ASC | by= DESC )
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:395:20: (by= ASC | by= DESC )
                     int alt41=2;
                     int LA41_0 = input.LA(1);
 
@@ -5557,7 +5602,7 @@ public class CMISParser extends Parser {
                     }
                     switch (alt41) {
                         case 1 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:395:22: by= ASC
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:395:22: by= ASC
                             {
                             by=(Token)match(input,ASC,FOLLOW_ASC_in_sortSpecification1682); if (state.failed) return retval; 
                             if ( state.backtracking==0 ) stream_ASC.add(by);
@@ -5566,7 +5611,7 @@ public class CMISParser extends Parser {
                             }
                             break;
                         case 2 :
-                            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:395:31: by= DESC
+                            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:395:31: by= DESC
                             {
                             by=(Token)match(input,DESC,FOLLOW_DESC_in_sortSpecification1688); if (state.failed) return retval; 
                             if ( state.backtracking==0 ) stream_DESC.add(by);
@@ -5580,20 +5625,21 @@ public class CMISParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: columnReference, by
+                    // elements: by, columnReference
                     // token labels: by
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     if ( state.backtracking==0 ) {
                     retval.tree = root_0;
                     RewriteRuleTokenStream stream_by=new RewriteRuleTokenStream(adaptor,"token by",by);
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 396:3: -> ^( SORT_SPECIFICATION columnReference $by)
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:396:6: ^( SORT_SPECIFICATION columnReference $by)
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:396: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);
@@ -5606,7 +5652,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -5628,15 +5674,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end sortSpecification
+    // $ANTLR end "sortSpecification"
 
     public static class correlationName_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start correlationName
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:399:1: correlationName : identifier ;
+    // $ANTLR start "correlationName"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:399:1: correlationName : identifier ;
     public final CMISParser.correlationName_return correlationName() throws RecognitionException {
         CMISParser.correlationName_return retval = new CMISParser.correlationName_return();
         retval.start = input.LT(1);
@@ -5648,8 +5694,8 @@ public class CMISParser extends Parser {
 
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:400:2: ( identifier )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:400:4: identifier
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:400:2: ( identifier )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:400:4: identifier
             {
             root_0 = (Object)adaptor.nil();
 
@@ -5679,15 +5725,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end correlationName
+    // $ANTLR end "correlationName"
 
     public static class tableName_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start tableName
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:407:1: tableName : identifier -> identifier ;
+    // $ANTLR start "tableName"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:407: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);
@@ -5699,8 +5745,8 @@ public class CMISParser extends Parser {
 
         RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:408:2: ( identifier -> identifier )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:408:4: identifier
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:408:2: ( identifier -> identifier )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:408:4: identifier
             {
             pushFollow(FOLLOW_identifier_in_tableName1729);
             identifier147=identifier();
@@ -5716,9 +5762,10 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 409:3: -> identifier
@@ -5727,7 +5774,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -5747,15 +5794,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end tableName
+    // $ANTLR end "tableName"
 
     public static class columnName_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start columnName
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:412:1: columnName : identifier -> identifier ;
+    // $ANTLR start "columnName"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:412: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);
@@ -5767,8 +5814,8 @@ public class CMISParser extends Parser {
 
         RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:413:2: ( identifier -> identifier )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:413:4: identifier
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:413:2: ( identifier -> identifier )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:413:4: identifier
             {
             pushFollow(FOLLOW_identifier_in_columnName1747);
             identifier148=identifier();
@@ -5784,9 +5831,10 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 414:3: -> identifier
@@ -5795,7 +5843,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -5815,15 +5863,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end columnName
+    // $ANTLR end "columnName"
 
     public static class multiValuedColumnName_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start multiValuedColumnName
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:417:1: multiValuedColumnName : identifier -> identifier ;
+    // $ANTLR start "multiValuedColumnName"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:417: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);
@@ -5835,8 +5883,8 @@ public class CMISParser extends Parser {
 
         RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:418:2: ( identifier -> identifier )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:418:4: identifier
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:2: ( identifier -> identifier )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:4: identifier
             {
             pushFollow(FOLLOW_identifier_in_multiValuedColumnName1766);
             identifier149=identifier();
@@ -5852,9 +5900,10 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 419:3: -> identifier
@@ -5863,7 +5912,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -5883,15 +5932,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end multiValuedColumnName
+    // $ANTLR end "multiValuedColumnName"
 
     public static class parameterName_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start parameterName
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:422:1: parameterName : COLON identifier -> ^( PARAMETER identifier ) ;
+    // $ANTLR start "parameterName"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:422: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);
@@ -5906,8 +5955,8 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:423:2: ( COLON identifier -> ^( PARAMETER identifier ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:423:4: COLON identifier
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:423:2: ( COLON identifier -> ^( PARAMETER identifier ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:423:4: COLON identifier
             {
             COLON150=(Token)match(input,COLON,FOLLOW_COLON_in_parameterName1784); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_COLON.add(COLON150);
@@ -5926,14 +5975,15 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 424:3: -> ^( PARAMETER identifier )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:424:6: ^( PARAMETER identifier )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:424:6: ^( PARAMETER identifier )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PARAMETER, "PARAMETER"), root_1);
@@ -5945,7 +5995,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -5965,15 +6015,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end parameterName
+    // $ANTLR end "parameterName"
 
     public static class folderId_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start folderId
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:427:1: folderId : characterStringLiteral -> characterStringLiteral ;
+    // $ANTLR start "folderId"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:427: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);
@@ -5985,8 +6035,8 @@ public class CMISParser extends Parser {
 
         RewriteRuleSubtreeStream stream_characterStringLiteral=new RewriteRuleSubtreeStream(adaptor,"rule characterStringLiteral");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:428:3: ( characterStringLiteral -> characterStringLiteral )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:428:5: characterStringLiteral
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:428:3: ( characterStringLiteral -> characterStringLiteral )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:428:5: characterStringLiteral
             {
             pushFollow(FOLLOW_characterStringLiteral_in_folderId1809);
             characterStringLiteral152=characterStringLiteral();
@@ -6002,9 +6052,10 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 429:4: -> characterStringLiteral
@@ -6013,7 +6064,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -6033,15 +6084,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end folderId
+    // $ANTLR end "folderId"
 
     public static class textSearchExpression_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start textSearchExpression
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:432:1: textSearchExpression : QUOTED_STRING ;
+    // $ANTLR start "textSearchExpression"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:432: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);
@@ -6053,8 +6104,8 @@ public class CMISParser extends Parser {
         Object QUOTED_STRING153_tree=null;
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:433:2: ( QUOTED_STRING )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:433:4: QUOTED_STRING
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:433:2: ( QUOTED_STRING )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:433:4: QUOTED_STRING
             {
             root_0 = (Object)adaptor.nil();
 
@@ -6083,15 +6134,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end textSearchExpression
+    // $ANTLR end "textSearchExpression"
 
     public static class identifier_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start identifier
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:436:1: identifier : ( ID -> ID | DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) );
+    // $ANTLR start "identifier"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:436: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);
@@ -6111,7 +6162,7 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_DOUBLE_QUOTE=new RewriteRuleTokenStream(adaptor,"token DOUBLE_QUOTE");
         RewriteRuleSubtreeStream stream_keyWordOrId=new RewriteRuleSubtreeStream(adaptor,"rule keyWordOrId");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:437:2: ( ID -> ID | DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:437:2: ( ID -> ID | DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) )
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -6130,7 +6181,7 @@ public class CMISParser extends Parser {
             }
             switch (alt43) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:437:4: ID
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:437:4: ID
                     {
                     ID154=(Token)match(input,ID,FOLLOW_ID_in_identifier1842); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_ID.add(ID154);
@@ -6143,9 +6194,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 438:3: -> ID
@@ -6154,11 +6206,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:439:4: DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:439:4: DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE
                     {
                     DOUBLE_QUOTE155=(Token)match(input,DOUBLE_QUOTE,FOLLOW_DOUBLE_QUOTE_in_identifier1853); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_DOUBLE_QUOTE.add(DOUBLE_QUOTE155);
@@ -6180,14 +6232,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 440:3: -> ^( keyWordOrId )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:440:6: ^( keyWordOrId )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:440:6: ^( keyWordOrId )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(stream_keyWordOrId.nextNode(), root_1);
@@ -6197,7 +6250,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -6219,15 +6272,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end identifier
+    // $ANTLR end "identifier"
 
     public static class signedNumericLiteral_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start signedNumericLiteral
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:443:1: signedNumericLiteral : ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral );
+    // $ANTLR start "signedNumericLiteral"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:443: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);
@@ -6242,7 +6295,7 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_FLOATING_POINT_LITERAL=new RewriteRuleTokenStream(adaptor,"token FLOATING_POINT_LITERAL");
         RewriteRuleSubtreeStream stream_integerLiteral=new RewriteRuleSubtreeStream(adaptor,"rule integerLiteral");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:444:2: ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:444:2: ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral )
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -6261,7 +6314,7 @@ public class CMISParser extends Parser {
             }
             switch (alt44) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:444:4: FLOATING_POINT_LITERAL
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:444:4: FLOATING_POINT_LITERAL
                     {
                     FLOATING_POINT_LITERAL158=(Token)match(input,FLOATING_POINT_LITERAL,FOLLOW_FLOATING_POINT_LITERAL_in_signedNumericLiteral1877); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_FLOATING_POINT_LITERAL.add(FLOATING_POINT_LITERAL158);
@@ -6274,14 +6327,15 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 445:3: -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL )
                     {
-                        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:445:6: ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:445: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);
@@ -6293,11 +6347,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:446:4: integerLiteral
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:446:4: integerLiteral
                     {
                     pushFollow(FOLLOW_integerLiteral_in_signedNumericLiteral1892);
                     integerLiteral159=integerLiteral();
@@ -6313,9 +6367,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 447:3: -> integerLiteral
@@ -6324,7 +6379,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -6346,15 +6401,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end signedNumericLiteral
+    // $ANTLR end "signedNumericLiteral"
 
     public static class integerLiteral_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start integerLiteral
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:450:1: integerLiteral : DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) ;
+    // $ANTLR start "integerLiteral"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:450: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);
@@ -6367,8 +6422,8 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_DECIMAL_INTEGER_LITERAL=new RewriteRuleTokenStream(adaptor,"token DECIMAL_INTEGER_LITERAL");
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:451:2: ( DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:451:4: DECIMAL_INTEGER_LITERAL
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:451:2: ( DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:451:4: DECIMAL_INTEGER_LITERAL
             {
             DECIMAL_INTEGER_LITERAL160=(Token)match(input,DECIMAL_INTEGER_LITERAL,FOLLOW_DECIMAL_INTEGER_LITERAL_in_integerLiteral1911); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_DECIMAL_INTEGER_LITERAL.add(DECIMAL_INTEGER_LITERAL160);
@@ -6381,14 +6436,15 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 452:3: -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:452:6: ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:452: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);
@@ -6400,7 +6456,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -6420,15 +6476,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end integerLiteral
+    // $ANTLR end "integerLiteral"
 
     public static class characterStringLiteral_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start characterStringLiteral
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:455:1: characterStringLiteral : QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) ;
+    // $ANTLR start "characterStringLiteral"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:455: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);
@@ -6441,8 +6497,8 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_QUOTED_STRING=new RewriteRuleTokenStream(adaptor,"token QUOTED_STRING");
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:456:2: ( QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:456:4: QUOTED_STRING
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:456:2: ( QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:456:4: QUOTED_STRING
             {
             QUOTED_STRING161=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_characterStringLiteral1934); if (state.failed) return retval; 
             if ( state.backtracking==0 ) stream_QUOTED_STRING.add(QUOTED_STRING161);
@@ -6455,14 +6511,15 @@ public class CMISParser extends Parser {
             // 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,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
             // 457:3: -> ^( STRING_LITERAL QUOTED_STRING )
             {
-                // W:\\workspace-cmis2\\ANTLR\\CMIS.g:457:6: ^( STRING_LITERAL QUOTED_STRING )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:457: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);
@@ -6474,7 +6531,7 @@ public class CMISParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;}
+            retval.tree = root_0;}
             }
 
             retval.stop = input.LT(-1);
@@ -6494,15 +6551,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end characterStringLiteral
+    // $ANTLR end "characterStringLiteral"
 
     public static class keyWord_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start keyWord
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:461:1: keyWord : ( SELECT | AS | UPPER | LOWER | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | SCORE );
+    // $ANTLR start "keyWord"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:461:1: keyWord : ( SELECT | AS | UPPER | LOWER | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | SCORE );
     public final CMISParser.keyWord_return keyWord() throws RecognitionException {
         CMISParser.keyWord_return retval = new CMISParser.keyWord_return();
         retval.start = input.LT(1);
@@ -6514,8 +6571,8 @@ public class CMISParser extends Parser {
         Object set162_tree=null;
 
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:461:9: ( SELECT | AS | UPPER | LOWER | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | SCORE )
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:461:9: ( SELECT | AS | UPPER | LOWER | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | SCORE )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
             {
             root_0 = (Object)adaptor.nil();
 
@@ -6551,15 +6608,15 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end keyWord
+    // $ANTLR end "keyWord"
 
     public static class keyWordOrId_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start keyWordOrId
-    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:490:1: keyWordOrId : ( keyWord -> keyWord | ID -> ID );
+    // $ANTLR start "keyWordOrId"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:490: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);
@@ -6574,7 +6631,7 @@ public class CMISParser extends Parser {
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_keyWord=new RewriteRuleSubtreeStream(adaptor,"rule keyWord");
         try {
-            // W:\\workspace-cmis2\\ANTLR\\CMIS.g:491:2: ( keyWord -> keyWord | ID -> ID )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:491:2: ( keyWord -> keyWord | ID -> ID )
             int alt45=2;
             int LA45_0 = input.LA(1);
 
@@ -6593,7 +6650,7 @@ public class CMISParser extends Parser {
             }
             switch (alt45) {
                 case 1 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:491:4: keyWord
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:491:4: keyWord
                     {
                     pushFollow(FOLLOW_keyWord_in_keyWordOrId2143);
                     keyWord163=keyWord();
@@ -6609,9 +6666,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 492:3: -> keyWord
@@ -6620,11 +6678,11 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis2\\ANTLR\\CMIS.g:493:4: ID
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:493:4: ID
                     {
                     ID164=(Token)match(input,ID,FOLLOW_ID_in_keyWordOrId2155); if (state.failed) return retval; 
                     if ( state.backtracking==0 ) stream_ID.add(ID164);
@@ -6637,9 +6695,10 @@ public class CMISParser extends Parser {
                     // 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,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
                     // 494:3: -> ID
@@ -6648,7 +6707,7 @@ public class CMISParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;}
+                    retval.tree = root_0;}
                     }
                     break;
 
@@ -6670,12 +6729,12 @@ public class CMISParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end keyWordOrId
+    // $ANTLR end "keyWordOrId"
 
     // $ANTLR start synpred1_CMIS
     public final void synpred1_CMIS_fragment() throws RecognitionException {   
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:165:4: ( valueExpression )
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:165:5: valueExpression
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:165:4: ( valueExpression )
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:165:5: valueExpression
         {
         pushFollow(FOLLOW_valueExpression_in_synpred1_CMIS287);
         valueExpression();
@@ -6689,8 +6748,8 @@ public class CMISParser extends Parser {
 
     // $ANTLR start synpred2_CMIS
     public final void synpred2_CMIS_fragment() throws RecognitionException {   
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:207:4: ( tableName )
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:207:5: tableName
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:207:4: ( tableName )
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:207:5: tableName
         {
         pushFollow(FOLLOW_tableName_in_synpred2_CMIS566);
         tableName();
@@ -6704,8 +6763,8 @@ public class CMISParser extends Parser {
 
     // $ANTLR start synpred3_CMIS
     public final void synpred3_CMIS_fragment() throws RecognitionException {   
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:221:17: ( joinedTable )
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:221:18: joinedTable
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:221:17: ( joinedTable )
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:221:18: joinedTable
         {
         pushFollow(FOLLOW_joinedTable_in_synpred3_CMIS644);
         joinedTable();
@@ -6719,8 +6778,8 @@ public class CMISParser extends Parser {
 
     // $ANTLR start synpred4_CMIS
     public final void synpred4_CMIS_fragment() throws RecognitionException {   
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:236:35: ( joinSpecification )
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:236:36: joinSpecification
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:236:35: ( joinSpecification )
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:236:36: joinSpecification
         {
         pushFollow(FOLLOW_joinSpecification_in_synpred4_CMIS741);
         joinSpecification();
@@ -6734,8 +6793,8 @@ public class CMISParser extends Parser {
 
     // $ANTLR start synpred5_CMIS
     public final void synpred5_CMIS_fragment() throws RecognitionException {   
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:351:6: ( columnReference )
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:351:7: columnReference
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:351:6: ( columnReference )
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:351:7: columnReference
         {
         pushFollow(FOLLOW_columnReference_in_synpred5_CMIS1319);
         columnReference();
@@ -6749,8 +6808,8 @@ public class CMISParser extends Parser {
 
     // $ANTLR start synpred6_CMIS
     public final void synpred6_CMIS_fragment() throws RecognitionException {   
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:353:11: ( columnReference )
-        // W:\\workspace-cmis2\\ANTLR\\CMIS.g:353:12: columnReference
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:11: ( columnReference )
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:12: columnReference
         {
         pushFollow(FOLLOW_columnReference_in_synpred6_CMIS1357);
         columnReference();
@@ -7190,8 +7249,8 @@ public class CMISParser extends Parser {
     public static final BitSet FOLLOW_selectSubList_in_selectList249 = new BitSet(new long[]{0x0000000080000002L});
     public static final BitSet FOLLOW_COMMA_in_selectList253 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
     public static final BitSet FOLLOW_selectSubList_in_selectList255 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_valueExpression_in_selectSubList291 = new BitSet(new long[]{0xFFE0F7E160000002L,0x0000000000000399L});
-    public static final BitSet FOLLOW_AS_in_selectSubList295 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_valueExpression_in_selectSubList291 = new BitSet(new long[]{0x0000000100000002L,0x0000000000000018L});
+    public static final BitSet FOLLOW_AS_in_selectSubList295 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_columnName_in_selectSubList298 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_qualifier_in_selectSubList319 = new BitSet(new long[]{0x0000000200000000L});
     public static final BitSet FOLLOW_DOTSTAR_in_selectSubList321 = new BitSet(new long[]{0x0000000000000002L});
@@ -7199,34 +7258,34 @@ public class CMISParser extends Parser {
     public static final BitSet FOLLOW_columnReference_in_valueExpression356 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_valueFunction_in_valueExpression369 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_qualifier_in_columnReference392 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_DOT_in_columnReference394 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_DOT_in_columnReference394 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_columnName_in_columnReference399 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_qualifier_in_multiValuedColumnReference435 = new BitSet(new long[]{0x0000000400000000L});
     public static final BitSet FOLLOW_DOT_in_multiValuedColumnReference437 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
     public static final BitSet FOLLOW_multiValuedColumnName_in_multiValuedColumnReference443 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_keyWordOrId_in_valueFunction470 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LPAREN_in_valueFunction472 = new BitSet(new long[]{0xFFE0F7F160000000L,0x00000000000003FFL});
-    public static final BitSet FOLLOW_functionArgument_in_valueFunction474 = new BitSet(new long[]{0xFFE0F7F160000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_LPAREN_in_valueFunction472 = new BitSet(new long[]{0x0000001000000000L,0x000000000000007EL});
+    public static final BitSet FOLLOW_functionArgument_in_valueFunction474 = new BitSet(new long[]{0x0000001000000000L,0x000000000000007EL});
     public static final BitSet FOLLOW_RPAREN_in_valueFunction477 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_qualifier_in_functionArgument512 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_DOT_in_functionArgument514 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_DOT_in_functionArgument514 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_columnName_in_functionArgument516 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_identifier_in_functionArgument540 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_literalOrParameterName_in_functionArgument550 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_tableName_in_qualifier571 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_correlationName_in_qualifier583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FROM_in_fromClause620 = new BitSet(new long[]{0xFFE0F7E960000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_FROM_in_fromClause620 = new BitSet(new long[]{0x0000000800000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_tableReference_in_fromClause622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_singleTable_in_tableReference640 = new BitSet(new long[]{0x000001C000000000L});
+    public static final BitSet FOLLOW_singleTable_in_tableReference640 = new BitSet(new long[]{0x000001C000000002L});
     public static final BitSet FOLLOW_joinedTable_in_tableReference649 = new BitSet(new long[]{0x000001C000000002L});
-    public static final BitSet FOLLOW_tableName_in_singleTable678 = new BitSet(new long[]{0xFFE0F7E160000002L,0x0000000000000399L});
-    public static final BitSet FOLLOW_AS_in_singleTable682 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_tableName_in_singleTable678 = new BitSet(new long[]{0x0000000100000002L,0x0000000000000018L});
+    public static final BitSet FOLLOW_AS_in_singleTable682 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_correlationName_in_singleTable685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_singleTable706 = new BitSet(new long[]{0xFFE0F7E960000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_LPAREN_in_singleTable706 = new BitSet(new long[]{0x0000000800000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_joinedTables_in_singleTable708 = new BitSet(new long[]{0x0000001000000000L});
     public static final BitSet FOLLOW_RPAREN_in_singleTable710 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_joinType_in_joinedTable732 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_JOIN_in_joinedTable735 = new BitSet(new long[]{0xFFE0F7E960000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_JOIN_in_joinedTable735 = new BitSet(new long[]{0x0000000800000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_tableReference_in_joinedTable737 = new BitSet(new long[]{0x0000040000000002L});
     public static final BitSet FOLLOW_joinSpecification_in_joinedTable746 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_singleTable_in_joinedTables777 = new BitSet(new long[]{0x000001C000000000L});
@@ -7235,24 +7294,24 @@ public class CMISParser extends Parser {
     public static final BitSet FOLLOW_LEFT_in_joinType818 = new BitSet(new long[]{0x0000020000000002L});
     public static final BitSet FOLLOW_OUTER_in_joinType820 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ON_in_joinSpecification840 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LPAREN_in_joinSpecification842 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_LPAREN_in_joinSpecification842 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_columnReference_in_joinSpecification846 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_EQUALS_in_joinSpecification848 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_EQUALS_in_joinSpecification848 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_columnReference_in_joinSpecification852 = new BitSet(new long[]{0x0000001000000000L});
     public static final BitSet FOLLOW_RPAREN_in_joinSpecification854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_WHERE_in_whereClause904 = new BitSet(new long[]{0xFFE0F7F960000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_WHERE_in_whereClause904 = new BitSet(new long[]{0xFFE0F7E960000000L,0x00000000000003FFL});
     public static final BitSet FOLLOW_searchOrCondition_in_whereClause906 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_searchAndCondition_in_searchOrCondition926 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_OR_in_searchOrCondition929 = new BitSet(new long[]{0xFFE0F7F960000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_OR_in_searchOrCondition929 = new BitSet(new long[]{0xFFE0F7E960000000L,0x00000000000003FFL});
     public static final BitSet FOLLOW_searchAndCondition_in_searchOrCondition931 = new BitSet(new long[]{0x0000200000000002L});
     public static final BitSet FOLLOW_searchNotCondition_in_searchAndCondition959 = new BitSet(new long[]{0x0000400000000002L});
-    public static final BitSet FOLLOW_AND_in_searchAndCondition962 = new BitSet(new long[]{0xFFE0F7F960000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_AND_in_searchAndCondition962 = new BitSet(new long[]{0xFFE0F7E960000000L,0x00000000000003FFL});
     public static final BitSet FOLLOW_searchNotCondition_in_searchAndCondition964 = new BitSet(new long[]{0x0000400000000002L});
-    public static final BitSet FOLLOW_NOT_in_searchNotCondition991 = new BitSet(new long[]{0xFFE0F7F960000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_NOT_in_searchNotCondition991 = new BitSet(new long[]{0xFFE0F7E960000000L,0x00000000000003FFL});
     public static final BitSet FOLLOW_searchTest_in_searchNotCondition993 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_searchTest_in_searchNotCondition1008 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_predicate_in_searchTest1026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_searchTest1037 = new BitSet(new long[]{0xFFE0F7F960000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_LPAREN_in_searchTest1037 = new BitSet(new long[]{0xFFE0F7E960000000L,0x00000000000003FFL});
     public static final BitSet FOLLOW_searchOrCondition_in_searchTest1039 = new BitSet(new long[]{0x0000001000000000L});
     public static final BitSet FOLLOW_RPAREN_in_searchTest1041 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_comparisonPredicate_in_predicate1058 = new BitSet(new long[]{0x0000000000000002L});
@@ -7264,7 +7323,7 @@ public class CMISParser extends Parser {
     public static final BitSet FOLLOW_textSearchPredicate_in_predicate1089 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_folderPredicate_in_predicate1094 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_valueExpression_in_comparisonPredicate1106 = new BitSet(new long[]{0x001F080000000000L});
-    public static final BitSet FOLLOW_compOp_in_comparisonPredicate1108 = new BitSet(new long[]{0xFFE0F7F160000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_compOp_in_comparisonPredicate1108 = new BitSet(new long[]{0x0000000000000000L,0x000000000000007EL});
     public static final BitSet FOLLOW_literalOrParameterName_in_comparisonPredicate1110 = 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_literalOrParameterName1176 = new BitSet(new long[]{0x0000000000000002L});
@@ -7274,15 +7333,15 @@ public class CMISParser extends Parser {
     public static final BitSet FOLLOW_columnReference_in_inPredicate1211 = new BitSet(new long[]{0x0020800000000000L});
     public static final BitSet FOLLOW_NOT_in_inPredicate1213 = new BitSet(new long[]{0x0020000000000000L});
     public static final BitSet FOLLOW_IN_in_inPredicate1216 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LPAREN_in_inPredicate1218 = new BitSet(new long[]{0xFFE0F7F160000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_LPAREN_in_inPredicate1218 = new BitSet(new long[]{0x0000000000000000L,0x000000000000007EL});
     public static final BitSet FOLLOW_inValueList_in_inPredicate1220 = new BitSet(new long[]{0x0000001000000000L});
     public static final BitSet FOLLOW_RPAREN_in_inPredicate1222 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_literalOrParameterName_in_inValueList1251 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_COMMA_in_inValueList1254 = new BitSet(new long[]{0xFFE0F7F160000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_COMMA_in_inValueList1254 = new BitSet(new long[]{0x0000000000000000L,0x000000000000007EL});
     public static final BitSet FOLLOW_literalOrParameterName_in_inValueList1256 = new BitSet(new long[]{0x0000000080000002L});
     public static final BitSet FOLLOW_columnReference_in_likePredicate1282 = new BitSet(new long[]{0x0040800000000000L});
     public static final BitSet FOLLOW_NOT_in_likePredicate1284 = new BitSet(new long[]{0x0040000000000000L});
-    public static final BitSet FOLLOW_LIKE_in_likePredicate1287 = new BitSet(new long[]{0xFFE0F7E1E0000000L,0x00000000000003FDL});
+    public static final BitSet FOLLOW_LIKE_in_likePredicate1287 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000064L});
     public static final BitSet FOLLOW_characterStringLiteral_in_likePredicate1289 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_columnReference_in_nullPredicate1323 = new BitSet(new long[]{0x0080000000000000L});
     public static final BitSet FOLLOW_multiValuedColumnReference_in_nullPredicate1327 = new BitSet(new long[]{0x0080000000000000L});
@@ -7301,30 +7360,30 @@ public class CMISParser extends Parser {
     public static final BitSet FOLLOW_multiValuedColumnReference_in_quantifiedInPredicate1437 = new BitSet(new long[]{0x0020800000000000L});
     public static final BitSet FOLLOW_NOT_in_quantifiedInPredicate1439 = new BitSet(new long[]{0x0020000000000000L});
     public static final BitSet FOLLOW_IN_in_quantifiedInPredicate1442 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LPAREN_in_quantifiedInPredicate1445 = new BitSet(new long[]{0xFFE0F7F160000000L,0x00000000000003FFL});
+    public static final BitSet FOLLOW_LPAREN_in_quantifiedInPredicate1445 = new BitSet(new long[]{0x0000000000000000L,0x000000000000007EL});
     public static final BitSet FOLLOW_inValueList_in_quantifiedInPredicate1447 = new BitSet(new long[]{0x0000001000000000L});
     public static final BitSet FOLLOW_RPAREN_in_quantifiedInPredicate1449 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_CONTAINS_in_textSearchPredicate1478 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LPAREN_in_textSearchPredicate1480 = new BitSet(new long[]{0xFFE0F7E1E0000000L,0x000000000000039DL});
+    public static final BitSet FOLLOW_LPAREN_in_textSearchPredicate1480 = new BitSet(new long[]{0x0000000080000000L,0x000000000000001CL});
     public static final BitSet FOLLOW_qualifier_in_textSearchPredicate1483 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_COMMA_in_textSearchPredicate1485 = new BitSet(new long[]{0xFFE0F7E1E0000000L,0x000000000000039DL});
-    public static final BitSet FOLLOW_COMMA_in_textSearchPredicate1489 = new BitSet(new long[]{0xFFE0F7E1E0000000L,0x000000000000039DL});
+    public static final BitSet FOLLOW_COMMA_in_textSearchPredicate1485 = new BitSet(new long[]{0x0000000080000000L,0x000000000000001CL});
+    public static final BitSet FOLLOW_COMMA_in_textSearchPredicate1489 = new BitSet(new long[]{0x0000000080000000L,0x000000000000001CL});
     public static final BitSet FOLLOW_textSearchExpression_in_textSearchPredicate1493 = new BitSet(new long[]{0x0000001000000000L});
     public static final BitSet FOLLOW_RPAREN_in_textSearchPredicate1495 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_IN_FOLDER_in_folderPredicate1520 = new BitSet(new long[]{0x0000000800000000L});
     public static final BitSet FOLLOW_folderPredicateArgs_in_folderPredicate1523 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_IN_TREE_in_folderPredicate1544 = new BitSet(new long[]{0x0000000800000000L});
     public static final BitSet FOLLOW_folderPredicateArgs_in_folderPredicate1546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_folderPredicateArgs1568 = new BitSet(new long[]{0xFFE0F7E1E0000000L,0x00000000000003FDL});
+    public static final BitSet FOLLOW_LPAREN_in_folderPredicateArgs1568 = new BitSet(new long[]{0x0000000080000000L,0x000000000000007CL});
     public static final BitSet FOLLOW_qualifier_in_folderPredicateArgs1571 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_COMMA_in_folderPredicateArgs1573 = new BitSet(new long[]{0xFFE0F7E1E0000000L,0x00000000000003FDL});
-    public static final BitSet FOLLOW_COMMA_in_folderPredicateArgs1577 = new BitSet(new long[]{0xFFE0F7E1E0000000L,0x00000000000003FDL});
+    public static final BitSet FOLLOW_COMMA_in_folderPredicateArgs1573 = new BitSet(new long[]{0x0000000080000000L,0x000000000000007CL});
+    public static final BitSet FOLLOW_COMMA_in_folderPredicateArgs1577 = new BitSet(new long[]{0x0000000080000000L,0x000000000000007CL});
     public static final BitSet FOLLOW_folderId_in_folderPredicateArgs1581 = new BitSet(new long[]{0x0000001000000000L});
     public static final BitSet FOLLOW_RPAREN_in_folderPredicateArgs1583 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ORDER_in_orderByClause1622 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_BY_in_orderByClause1624 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_BY_in_orderByClause1624 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_sortSpecification_in_orderByClause1626 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_COMMA_in_orderByClause1630 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_COMMA_in_orderByClause1630 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_sortSpecification_in_orderByClause1632 = new BitSet(new long[]{0x0000000080000002L});
     public static final BitSet FOLLOW_columnReference_in_sortSpecification1658 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_columnReference_in_sortSpecification1676 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000001L});
@@ -7334,7 +7393,7 @@ public class CMISParser extends Parser {
     public static final BitSet FOLLOW_identifier_in_tableName1729 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_identifier_in_columnName1747 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_identifier_in_multiValuedColumnName1766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLON_in_parameterName1784 = new BitSet(new long[]{0xFFE0F7E160000000L,0x0000000000000399L});
+    public static final BitSet FOLLOW_COLON_in_parameterName1784 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L});
     public static final BitSet FOLLOW_identifier_in_parameterName1786 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_characterStringLiteral_in_folderId1809 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_QUOTED_STRING_in_textSearchExpression1830 = new BitSet(new long[]{0x0000000000000002L});
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java
new file mode 100644
index 0000000000..6d4e6ec7d3
--- /dev/null
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java
@@ -0,0 +1,66 @@
+package org.alfresco.repo.search.impl.parsers;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+import org.alfresco.repo.node.BaseNodeServiceTest;
+import org.antlr.gunit.GrammarInfo;
+import org.antlr.gunit.gUnitExecutor;
+import org.antlr.gunit.gUnitLexer;
+import org.antlr.gunit.gUnitParser;
+import org.antlr.runtime.ANTLRInputStream;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+
+public class CMISTest extends TestCase
+{
+    public CMISTest()
+    {
+        // TODO Auto-generated constructor stub
+    }
+
+    public CMISTest(String name)
+    {
+        super(name);
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+    }
+
+    public void testLexer() throws IOException, RecognitionException
+    {
+        ClassLoader cl = BaseNodeServiceTest.class.getClassLoader();
+        InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/search/impl/parsers/cmis_test.gunit");
+
+        CharStream input = new ANTLRInputStream(modelStream);
+        
+        
+        gUnitExecutor executer = new gUnitExecutor(parse(input));
+        
+        System.out.print(executer.execTest());  // unit test result
+        
+        assertEquals("Failures ", 0, executer.failures.size()); 
+        assertEquals("Invalids ", 0, executer.invalids.size()); 
+    }
+
+    private GrammarInfo parse(CharStream input) throws RecognitionException
+    {
+        gUnitLexer lexer = new gUnitLexer(input);
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+
+        GrammarInfo grammarInfo = new GrammarInfo();
+        gUnitParser parser = new gUnitParser(tokens, grammarInfo);
+        parser.gUnitDef(); // parse gunit script and save elements to grammarInfo
+        return grammarInfo;
+    }
+
+    
+}
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/FTS.g b/source/java/org/alfresco/repo/search/impl/parsers/FTS.g
index 012b42f551..a9b8200ae8 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/FTS.g
+++ b/source/java/org/alfresco/repo/search/impl/parsers/FTS.g
@@ -24,10 +24,8 @@
  */
 
 /*
- * Parser for the CMIS query language
+ * Parser for the Alfresco query language
  *
- * The semantics of multivalued properties are ignored for the initial parse of the language.
- * They are applied in a second pass, when we have enough information to determine the column type. 
  */
  
 grammar FTS;
@@ -97,7 +95,7 @@ tokens
        if(e instanceof NoViableAltException)
        {
             NoViableAltException nvae = (NoViableAltException)e;
-            msg = " no viable alt; token="+e.token+
+            msg = "No viable alt; token="+e.token+
              " (decision="+nvae.decisionNumber+
              " state "+nvae.stateNumber+")"+
              " decision=<<"+nvae.grammarDecisionDescription+">>";
@@ -149,8 +147,7 @@ ftsExplicitDisjunction
 ftsExplictConjunction
 	:	ftsNot (AND ftsNot)*
 		-> ^(CONJUNCTION ftsNot)
-	;
-	
+	;	
 	
 ftsNot  
     :	MINUS ftsTest
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java b/source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java
index a5fce29509..5f60c4e6f8 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.1b1 W:\\workspace-cmis\\ANTLR\\FTS.g 2008-07-15 16:32:02
+// $ANTLR 3.1.2 W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g 2009-03-18 14:58:19
 package org.alfresco.repo.search.impl.parsers;
 
 import org.antlr.runtime.*;
@@ -56,15 +56,15 @@ public class FTSLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "W:\\workspace-cmis\\ANTLR\\FTS.g"; }
+    public String getGrammarFileName() { return "W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g"; }
 
-    // $ANTLR start OR
+    // $ANTLR start "OR"
     public final void mOR() throws RecognitionException {
         try {
             int _type = OR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:289:4: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:289:6: ( 'O' | 'o' ) ( 'R' | 'r' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:286:4: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:286:6: ( 'O' | 'o' ) ( 'R' | 'r' )
             {
             if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
                 input.consume();
@@ -93,15 +93,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end OR
+    // $ANTLR end "OR"
 
-    // $ANTLR start AND
+    // $ANTLR start "AND"
     public final void mAND() throws RecognitionException {
         try {
             int _type = AND;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:290:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:290:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:287:5: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:287:7: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' )
             {
             if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
                 input.consume();
@@ -139,15 +139,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end AND
+    // $ANTLR end "AND"
 
-    // $ANTLR start NOT
+    // $ANTLR start "NOT"
     public final void mNOT() throws RecognitionException {
         try {
             int _type = NOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:291:5: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:291:7: ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:288:5: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:288:7: ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' )
             {
             if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
                 input.consume();
@@ -185,15 +185,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end NOT
+    // $ANTLR end "NOT"
 
-    // $ANTLR start TILDA
+    // $ANTLR start "TILDA"
     public final void mTILDA() throws RecognitionException {
         try {
             int _type = TILDA;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:292:7: ( '~' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:292:9: '~'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:289:7: ( '~' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:289:9: '~'
             {
             match('~'); 
 
@@ -205,15 +205,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end TILDA
+    // $ANTLR end "TILDA"
 
-    // $ANTLR start LPAREN
+    // $ANTLR start "LPAREN"
     public final void mLPAREN() throws RecognitionException {
         try {
             int _type = LPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:293:8: ( '(' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:293:10: '('
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:290:8: ( '(' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:290:10: '('
             {
             match('('); 
 
@@ -225,15 +225,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end LPAREN
+    // $ANTLR end "LPAREN"
 
-    // $ANTLR start RPAREN
+    // $ANTLR start "RPAREN"
     public final void mRPAREN() throws RecognitionException {
         try {
             int _type = RPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:294:8: ( ')' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:294:10: ')'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:291:8: ( ')' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:291:10: ')'
             {
             match(')'); 
 
@@ -245,15 +245,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end RPAREN
+    // $ANTLR end "RPAREN"
 
-    // $ANTLR start PLUS
+    // $ANTLR start "PLUS"
     public final void mPLUS() throws RecognitionException {
         try {
             int _type = PLUS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:295:6: ( '+' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:295:8: '+'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:292:6: ( '+' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:292:8: '+'
             {
             match('+'); 
 
@@ -265,15 +265,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end PLUS
+    // $ANTLR end "PLUS"
 
-    // $ANTLR start MINUS
+    // $ANTLR start "MINUS"
     public final void mMINUS() throws RecognitionException {
         try {
             int _type = MINUS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:296:7: ( '-' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:296:9: '-'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:293:7: ( '-' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:293:9: '-'
             {
             match('-'); 
 
@@ -285,15 +285,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end MINUS
+    // $ANTLR end "MINUS"
 
-    // $ANTLR start COLON
+    // $ANTLR start "COLON"
     public final void mCOLON() throws RecognitionException {
         try {
             int _type = COLON;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:297:7: ( ':' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:297:9: ':'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:294:7: ( ':' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:294:9: ':'
             {
             match(':'); 
 
@@ -305,15 +305,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end COLON
+    // $ANTLR end "COLON"
 
-    // $ANTLR start STAR
+    // $ANTLR start "STAR"
     public final void mSTAR() throws RecognitionException {
         try {
             int _type = STAR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:298:6: ( '*' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:298:8: '*'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:295:6: ( '*' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:295:8: '*'
             {
             match('*'); 
 
@@ -325,15 +325,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end STAR
+    // $ANTLR end "STAR"
 
-    // $ANTLR start DOTDOT
+    // $ANTLR start "DOTDOT"
     public final void mDOTDOT() throws RecognitionException {
         try {
             int _type = DOTDOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:299:8: ( '..' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:299:10: '..'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:296:8: ( '..' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:296:10: '..'
             {
             match(".."); 
 
@@ -346,15 +346,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DOTDOT
+    // $ANTLR end "DOTDOT"
 
-    // $ANTLR start DOT
+    // $ANTLR start "DOT"
     public final void mDOT() throws RecognitionException {
         try {
             int _type = DOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:300:5: ( '.' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:300:7: '.'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:297:5: ( '.' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:297:7: '.'
             {
             match('.'); 
 
@@ -366,15 +366,15 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end DOT
+    // $ANTLR end "DOT"
 
-    // $ANTLR start ID
+    // $ANTLR start "ID"
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:302:5: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )* )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:302:9: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:299:5: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )* )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:299:9: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )*
             {
             if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
                 input.consume();
@@ -385,7 +385,7 @@ public class FTSLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:302:32: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:299:32: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '0' | '_' | '$' | '#' )*
             loop1:
             do {
                 int alt1=2;
@@ -398,7 +398,7 @@ public class FTSLexer extends Lexer {
 
                 switch (alt1) {
             	case 1 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:
             	    {
             	    if ( (input.LA(1)>='#' && input.LA(1)<='$')||input.LA(1)=='0'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -427,17 +427,17 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end ID
+    // $ANTLR end "ID"
 
-    // $ANTLR start FTSWORD
+    // $ANTLR start "FTSWORD"
     public final void mFTSWORD() throws RecognitionException {
         try {
             int _type = FTSWORD;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:304:9: ( ( INWORD )+ )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:304:12: ( INWORD )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:301:9: ( ( INWORD )+ )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:301:12: ( INWORD )+
             {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:304:12: ( INWORD )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:301:12: ( INWORD )+
             int cnt2=0;
             loop2:
             do {
@@ -451,7 +451,7 @@ public class FTSLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:304:12: INWORD
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:301:12: INWORD
             	    {
             	    mINWORD(); 
 
@@ -476,13 +476,13 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end FTSWORD
+    // $ANTLR end "FTSWORD"
 
-    // $ANTLR start INWORD
+    // $ANTLR start "INWORD"
     public final void mINWORD() throws RecognitionException {
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:307:8: ( '\\u0041' .. '\\u005A' | '\\u0061' .. '\\u007A' | '\\u00C0' .. '\\u00D6' | '\\u00D8' .. '\\u00F6' | '\\u00F8' .. '\\u00FF' | '\\u0100' .. '\\u1FFF' | '\\u3040' .. '\\u318F' | '\\u3300' .. '\\u337F' | '\\u3400' .. '\\u3D2D' | '\\u4E00' .. '\\u9FFF' | '\\uF900' .. '\\uFAFF' | '\\uAC00' .. '\\uD7AF' | '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06F0' .. '\\u06F9' | '\\u0966' .. '\\u096F' | '\\u09E6' .. '\\u09EF' | '\\u0A66' .. '\\u0A6F' | '\\u0AE6' .. '\\u0AEF' | '\\u0B66' .. '\\u0B6F' | '\\u0BE7' .. '\\u0BEF' | '\\u0C66' .. '\\u0C6F' | '\\u0CE6' .. '\\u0CEF' | '\\u0D66' .. '\\u0D6F' | '\\u0E50' .. '\\u0E59' | '\\u0ED0' .. '\\u0ED9' | '\\u1040' .. '\\u1049' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:304:8: ( '\\u0041' .. '\\u005A' | '\\u0061' .. '\\u007A' | '\\u00C0' .. '\\u00D6' | '\\u00D8' .. '\\u00F6' | '\\u00F8' .. '\\u00FF' | '\\u0100' .. '\\u1FFF' | '\\u3040' .. '\\u318F' | '\\u3300' .. '\\u337F' | '\\u3400' .. '\\u3D2D' | '\\u4E00' .. '\\u9FFF' | '\\uF900' .. '\\uFAFF' | '\\uAC00' .. '\\uD7AF' | '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06F0' .. '\\u06F9' | '\\u0966' .. '\\u096F' | '\\u09E6' .. '\\u09EF' | '\\u0A66' .. '\\u0A6F' | '\\u0AE6' .. '\\u0AEF' | '\\u0B66' .. '\\u0B6F' | '\\u0BE7' .. '\\u0BEF' | '\\u0C66' .. '\\u0C6F' | '\\u0CE6' .. '\\u0CEF' | '\\u0D66' .. '\\u0D6F' | '\\u0E50' .. '\\u0E59' | '\\u0ED0' .. '\\u0ED9' | '\\u1040' .. '\\u1049' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:
             {
             if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00D6')||(input.LA(1)>='\u00D8' && input.LA(1)<='\u00F6')||(input.LA(1)>='\u00F8' && input.LA(1)<='\u1FFF')||(input.LA(1)>='\u3040' && input.LA(1)<='\u318F')||(input.LA(1)>='\u3300' && input.LA(1)<='\u337F')||(input.LA(1)>='\u3400' && input.LA(1)<='\u3D2D')||(input.LA(1)>='\u4E00' && input.LA(1)<='\u9FFF')||(input.LA(1)>='\uAC00' && input.LA(1)<='\uD7AF')||(input.LA(1)>='\uF900' && input.LA(1)<='\uFAFF') ) {
                 input.consume();
@@ -500,18 +500,18 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end INWORD
+    // $ANTLR end "INWORD"
 
-    // $ANTLR start FTSPHRASE
+    // $ANTLR start "FTSPHRASE"
     public final void mFTSPHRASE() throws RecognitionException {
         try {
             int _type = FTSPHRASE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:337:2: ( '\"' (~ '\"' | '\"\"' )* '\"' )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:337:4: '\"' (~ '\"' | '\"\"' )* '\"'
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:334:2: ( '\"' (~ '\"' | '\"\"' )* '\"' )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:334:4: '\"' (~ '\"' | '\"\"' )* '\"'
             {
             match('\"'); 
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:337:8: (~ '\"' | '\"\"' )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:334:8: (~ '\"' | '\"\"' )*
             loop3:
             do {
                 int alt3=3;
@@ -526,16 +526,16 @@ public class FTSLexer extends Lexer {
 
 
                 }
-                else if ( ((LA3_0>='\u0000' && LA3_0<='!')||(LA3_0>='#' && LA3_0<='\uFFFE')) ) {
+                else if ( ((LA3_0>='\u0000' && LA3_0<='!')||(LA3_0>='#' && LA3_0<='\uFFFF')) ) {
                     alt3=1;
                 }
 
 
                 switch (alt3) {
             	case 1 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:337:9: ~ '\"'
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:334:9: ~ '\"'
             	    {
-            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='\uFFFE') ) {
+            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
 
             	    }
@@ -548,7 +548,7 @@ public class FTSLexer extends Lexer {
             	    }
             	    break;
             	case 2 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:337:16: '\"\"'
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:334:16: '\"\"'
             	    {
             	    match("\"\""); 
 
@@ -571,17 +571,17 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end FTSPHRASE
+    // $ANTLR end "FTSPHRASE"
 
-    // $ANTLR start WS
+    // $ANTLR start "WS"
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:339:4: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:339:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:336:4: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:336:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:339:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:336:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt4=0;
             loop4:
             do {
@@ -595,7 +595,7 @@ public class FTSLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -629,120 +629,120 @@ public class FTSLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end WS
+    // $ANTLR end "WS"
 
     public void mTokens() throws RecognitionException {
-        // W:\\workspace-cmis\\ANTLR\\FTS.g:1:8: ( OR | AND | NOT | TILDA | LPAREN | RPAREN | PLUS | MINUS | COLON | STAR | DOTDOT | DOT | ID | FTSWORD | FTSPHRASE | WS )
+        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:8: ( OR | AND | NOT | TILDA | LPAREN | RPAREN | PLUS | MINUS | COLON | STAR | DOTDOT | DOT | ID | FTSWORD | FTSPHRASE | WS )
         int alt5=16;
         alt5 = dfa5.predict(input);
         switch (alt5) {
             case 1 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:10: OR
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:10: OR
                 {
                 mOR(); 
 
                 }
                 break;
             case 2 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:13: AND
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:13: AND
                 {
                 mAND(); 
 
                 }
                 break;
             case 3 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:17: NOT
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:17: NOT
                 {
                 mNOT(); 
 
                 }
                 break;
             case 4 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:21: TILDA
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:21: TILDA
                 {
                 mTILDA(); 
 
                 }
                 break;
             case 5 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:27: LPAREN
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:27: LPAREN
                 {
                 mLPAREN(); 
 
                 }
                 break;
             case 6 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:34: RPAREN
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:34: RPAREN
                 {
                 mRPAREN(); 
 
                 }
                 break;
             case 7 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:41: PLUS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:41: PLUS
                 {
                 mPLUS(); 
 
                 }
                 break;
             case 8 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:46: MINUS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:46: MINUS
                 {
                 mMINUS(); 
 
                 }
                 break;
             case 9 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:52: COLON
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:52: COLON
                 {
                 mCOLON(); 
 
                 }
                 break;
             case 10 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:58: STAR
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:58: STAR
                 {
                 mSTAR(); 
 
                 }
                 break;
             case 11 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:63: DOTDOT
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:63: DOTDOT
                 {
                 mDOTDOT(); 
 
                 }
                 break;
             case 12 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:70: DOT
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:70: DOT
                 {
                 mDOT(); 
 
                 }
                 break;
             case 13 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:74: ID
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:74: ID
                 {
                 mID(); 
 
                 }
                 break;
             case 14 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:77: FTSWORD
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:77: FTSWORD
                 {
                 mFTSWORD(); 
 
                 }
                 break;
             case 15 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:85: FTSPHRASE
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:85: FTSPHRASE
                 {
                 mFTSPHRASE(); 
 
                 }
                 break;
             case 16 :
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:1:95: WS
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:1:95: WS
                 {
                 mWS(); 
 
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java b/source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java
index 90ba3b14ca..6bfc5ce5aa 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.1b1 W:\\workspace-cmis\\ANTLR\\FTS.g 2008-07-15 16:32:01
+// $ANTLR 3.1.2 W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g 2009-03-18 14:58:18
 package org.alfresco.repo.search.impl.parsers;
 
 import org.antlr.runtime.*;
@@ -60,6 +60,7 @@ public class FTSParser extends Parser {
         }
         public FTSParser(TokenStream input, RecognizerSharedState state) {
             super(input, state);
+             
         }
         
     protected TreeAdaptor adaptor = new CommonTreeAdaptor();
@@ -72,7 +73,7 @@ public class FTSParser extends Parser {
     }
 
     public String[] getTokenNames() { return FTSParser.tokenNames; }
-    public String getGrammarFileName() { return "W:\\workspace-cmis\\ANTLR\\FTS.g"; }
+    public String getGrammarFileName() { return "W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g"; }
 
 
         private Stack<String> paraphrases = new Stack<String>();
@@ -104,7 +105,7 @@ public class FTSParser extends Parser {
            if(e instanceof NoViableAltException)
            {
                 NoViableAltException nvae = (NoViableAltException)e;
-                msg = " no viable alt; token="+e.token+
+                msg = "No viable alt; token="+e.token+
                  " (decision="+nvae.decisionNumber+
                  " state "+nvae.stateNumber+")"+
                  " decision=<<"+nvae.grammarDecisionDescription+">>";
@@ -133,8 +134,8 @@ public class FTSParser extends Parser {
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start fts
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:132:1: fts : ftsImplicitConjunctionOrDisjunction EOF -> ftsImplicitConjunctionOrDisjunction ;
+    // $ANTLR start "fts"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:130:1: fts : ftsImplicitConjunctionOrDisjunction EOF -> ftsImplicitConjunctionOrDisjunction ;
     public final FTSParser.fts_return fts() throws RecognitionException {
         FTSParser.fts_return retval = new FTSParser.fts_return();
         retval.start = input.LT(1);
@@ -149,8 +150,8 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_EOF=new RewriteRuleTokenStream(adaptor,"token EOF");
         RewriteRuleSubtreeStream stream_ftsImplicitConjunctionOrDisjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsImplicitConjunctionOrDisjunction");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:133:5: ( ftsImplicitConjunctionOrDisjunction EOF -> ftsImplicitConjunctionOrDisjunction )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:133:8: ftsImplicitConjunctionOrDisjunction EOF
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:131:5: ( ftsImplicitConjunctionOrDisjunction EOF -> ftsImplicitConjunctionOrDisjunction )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:131:8: ftsImplicitConjunctionOrDisjunction EOF
             {
             pushFollow(FOLLOW_ftsImplicitConjunctionOrDisjunction_in_fts146);
             ftsImplicitConjunctionOrDisjunction1=ftsImplicitConjunctionOrDisjunction();
@@ -169,17 +170,18 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 134:3: -> ftsImplicitConjunctionOrDisjunction
+            // 132:3: -> ftsImplicitConjunctionOrDisjunction
             {
                 adaptor.addChild(root_0, stream_ftsImplicitConjunctionOrDisjunction.nextTree());
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -197,15 +199,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end fts
+    // $ANTLR end "fts"
 
     public static class ftsImplicitConjunctionOrDisjunction_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsImplicitConjunctionOrDisjunction
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:137:1: ftsImplicitConjunctionOrDisjunction : ({...}? ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( CONJUNCTION ( ftsExplicitDisjunction )+ ) | ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( DISJUNCTION ( ftsExplicitDisjunction )+ ) );
+    // $ANTLR start "ftsImplicitConjunctionOrDisjunction"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:135:1: ftsImplicitConjunctionOrDisjunction : ({...}? ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( CONJUNCTION ( ftsExplicitDisjunction )+ ) | ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( DISJUNCTION ( ftsExplicitDisjunction )+ ) );
     public final FTSParser.ftsImplicitConjunctionOrDisjunction_return ftsImplicitConjunctionOrDisjunction() throws RecognitionException {
         FTSParser.ftsImplicitConjunctionOrDisjunction_return retval = new FTSParser.ftsImplicitConjunctionOrDisjunction_return();
         retval.start = input.LT(1);
@@ -223,14 +225,14 @@ public class FTSParser extends Parser {
 
         RewriteRuleSubtreeStream stream_ftsExplicitDisjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsExplicitDisjunction");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:138:2: ({...}? ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( CONJUNCTION ( ftsExplicitDisjunction )+ ) | ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( DISJUNCTION ( ftsExplicitDisjunction )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:136:2: ({...}? ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( CONJUNCTION ( ftsExplicitDisjunction )+ ) | ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( DISJUNCTION ( ftsExplicitDisjunction )+ ) )
             int alt3=2;
             alt3 = dfa3.predict(input);
             switch (alt3) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:138:4: {...}? ftsExplicitDisjunction ( ftsExplicitDisjunction )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:136:4: {...}? ftsExplicitDisjunction ( ftsExplicitDisjunction )*
                     {
-                    if ( !(defaultConjunction()) ) {
+                    if ( !((defaultConjunction())) ) {
                         throw new FailedPredicateException(input, "ftsImplicitConjunctionOrDisjunction", "defaultConjunction()");
                     }
                     pushFollow(FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction170);
@@ -239,7 +241,7 @@ public class FTSParser extends Parser {
                     state._fsp--;
 
                     stream_ftsExplicitDisjunction.add(ftsExplicitDisjunction3.getTree());
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:138:51: ( ftsExplicitDisjunction )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:136:51: ( ftsExplicitDisjunction )*
                     loop1:
                     do {
                         int alt1=2;
@@ -252,7 +254,7 @@ public class FTSParser extends Parser {
 
                         switch (alt1) {
                     	case 1 :
-                    	    // W:\\workspace-cmis\\ANTLR\\FTS.g:138:52: ftsExplicitDisjunction
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:136:52: ftsExplicitDisjunction
                     	    {
                     	    pushFollow(FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction173);
                     	    ftsExplicitDisjunction4=ftsExplicitDisjunction();
@@ -277,13 +279,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 139:3: -> ^( CONJUNCTION ( ftsExplicitDisjunction )+ )
+                    // 137:3: -> ^( CONJUNCTION ( ftsExplicitDisjunction )+ )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:139:6: ^( CONJUNCTION ( ftsExplicitDisjunction )+ )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:137:6: ^( CONJUNCTION ( ftsExplicitDisjunction )+ )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(CONJUNCTION, "CONJUNCTION"), root_1);
@@ -302,11 +305,11 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:140:5: ftsExplicitDisjunction ( ftsExplicitDisjunction )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:138:5: ftsExplicitDisjunction ( ftsExplicitDisjunction )*
                     {
                     pushFollow(FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction192);
                     ftsExplicitDisjunction5=ftsExplicitDisjunction();
@@ -314,7 +317,7 @@ public class FTSParser extends Parser {
                     state._fsp--;
 
                     stream_ftsExplicitDisjunction.add(ftsExplicitDisjunction5.getTree());
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:140:28: ( ftsExplicitDisjunction )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:138:28: ( ftsExplicitDisjunction )*
                     loop2:
                     do {
                         int alt2=2;
@@ -327,7 +330,7 @@ public class FTSParser extends Parser {
 
                         switch (alt2) {
                     	case 1 :
-                    	    // W:\\workspace-cmis\\ANTLR\\FTS.g:140:29: ftsExplicitDisjunction
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:138:29: ftsExplicitDisjunction
                     	    {
                     	    pushFollow(FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction195);
                     	    ftsExplicitDisjunction6=ftsExplicitDisjunction();
@@ -352,13 +355,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 141:3: -> ^( DISJUNCTION ( ftsExplicitDisjunction )+ )
+                    // 139:3: -> ^( DISJUNCTION ( ftsExplicitDisjunction )+ )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:141:6: ^( DISJUNCTION ( ftsExplicitDisjunction )+ )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:139:6: ^( DISJUNCTION ( ftsExplicitDisjunction )+ )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DISJUNCTION, "DISJUNCTION"), root_1);
@@ -377,7 +381,7 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
 
@@ -397,15 +401,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsImplicitConjunctionOrDisjunction
+    // $ANTLR end "ftsImplicitConjunctionOrDisjunction"
 
     public static class ftsExplicitDisjunction_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsExplicitDisjunction
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:144:1: ftsExplicitDisjunction : ftsExplictConjunction ( OR ftsExplictConjunction )* -> ^( DISJUNCTION ( ftsExplictConjunction )+ ) ;
+    // $ANTLR start "ftsExplicitDisjunction"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:142:1: ftsExplicitDisjunction : ftsExplictConjunction ( OR ftsExplictConjunction )* -> ^( DISJUNCTION ( ftsExplictConjunction )+ ) ;
     public final FTSParser.ftsExplicitDisjunction_return ftsExplicitDisjunction() throws RecognitionException {
         FTSParser.ftsExplicitDisjunction_return retval = new FTSParser.ftsExplicitDisjunction_return();
         retval.start = input.LT(1);
@@ -422,8 +426,8 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_OR=new RewriteRuleTokenStream(adaptor,"token OR");
         RewriteRuleSubtreeStream stream_ftsExplictConjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsExplictConjunction");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:145:2: ( ftsExplictConjunction ( OR ftsExplictConjunction )* -> ^( DISJUNCTION ( ftsExplictConjunction )+ ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:145:4: ftsExplictConjunction ( OR ftsExplictConjunction )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:143:2: ( ftsExplictConjunction ( OR ftsExplictConjunction )* -> ^( DISJUNCTION ( ftsExplictConjunction )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:143:4: ftsExplictConjunction ( OR ftsExplictConjunction )*
             {
             pushFollow(FOLLOW_ftsExplictConjunction_in_ftsExplicitDisjunction220);
             ftsExplictConjunction7=ftsExplictConjunction();
@@ -431,7 +435,7 @@ public class FTSParser extends Parser {
             state._fsp--;
 
             stream_ftsExplictConjunction.add(ftsExplictConjunction7.getTree());
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:145:26: ( OR ftsExplictConjunction )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:143:26: ( OR ftsExplictConjunction )*
             loop4:
             do {
                 int alt4=2;
@@ -444,7 +448,7 @@ public class FTSParser extends Parser {
 
                 switch (alt4) {
             	case 1 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:145:27: OR ftsExplictConjunction
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:143:27: OR ftsExplictConjunction
             	    {
             	    OR8=(Token)match(input,OR,FOLLOW_OR_in_ftsExplicitDisjunction223);  
             	    stream_OR.add(OR8);
@@ -472,13 +476,14 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 146:3: -> ^( DISJUNCTION ( ftsExplictConjunction )+ )
+            // 144:3: -> ^( DISJUNCTION ( ftsExplictConjunction )+ )
             {
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:146:6: ^( DISJUNCTION ( ftsExplictConjunction )+ )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:144:6: ^( DISJUNCTION ( ftsExplictConjunction )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DISJUNCTION, "DISJUNCTION"), root_1);
@@ -497,7 +502,7 @@ public class FTSParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -515,15 +520,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsExplicitDisjunction
+    // $ANTLR end "ftsExplicitDisjunction"
 
     public static class ftsExplictConjunction_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsExplictConjunction
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:149:1: ftsExplictConjunction : ftsNot ( AND ftsNot )* -> ^( CONJUNCTION ftsNot ) ;
+    // $ANTLR start "ftsExplictConjunction"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:147:1: ftsExplictConjunction : ftsNot ( AND ftsNot )* -> ^( CONJUNCTION ftsNot ) ;
     public final FTSParser.ftsExplictConjunction_return ftsExplictConjunction() throws RecognitionException {
         FTSParser.ftsExplictConjunction_return retval = new FTSParser.ftsExplictConjunction_return();
         retval.start = input.LT(1);
@@ -540,8 +545,8 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_AND=new RewriteRuleTokenStream(adaptor,"token AND");
         RewriteRuleSubtreeStream stream_ftsNot=new RewriteRuleSubtreeStream(adaptor,"rule ftsNot");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:150:2: ( ftsNot ( AND ftsNot )* -> ^( CONJUNCTION ftsNot ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:150:4: ftsNot ( AND ftsNot )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:148:2: ( ftsNot ( AND ftsNot )* -> ^( CONJUNCTION ftsNot ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:148:4: ftsNot ( AND ftsNot )*
             {
             pushFollow(FOLLOW_ftsNot_in_ftsExplictConjunction250);
             ftsNot10=ftsNot();
@@ -549,7 +554,7 @@ public class FTSParser extends Parser {
             state._fsp--;
 
             stream_ftsNot.add(ftsNot10.getTree());
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:150:11: ( AND ftsNot )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:148:11: ( AND ftsNot )*
             loop5:
             do {
                 int alt5=2;
@@ -562,7 +567,7 @@ public class FTSParser extends Parser {
 
                 switch (alt5) {
             	case 1 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:150:12: AND ftsNot
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:148:12: AND ftsNot
             	    {
             	    AND11=(Token)match(input,AND,FOLLOW_AND_in_ftsExplictConjunction253);  
             	    stream_AND.add(AND11);
@@ -590,13 +595,14 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 151:3: -> ^( CONJUNCTION ftsNot )
+            // 149:3: -> ^( CONJUNCTION ftsNot )
             {
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:151:6: ^( CONJUNCTION ftsNot )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:149:6: ^( CONJUNCTION ftsNot )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(CONJUNCTION, "CONJUNCTION"), root_1);
@@ -608,7 +614,7 @@ public class FTSParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -626,15 +632,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsExplictConjunction
+    // $ANTLR end "ftsExplictConjunction"
 
     public static class ftsNot_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsNot
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:155:1: ftsNot : ( MINUS ftsTest -> ^( NEGATION ftsTest ) | ftsTest -> ftsTest );
+    // $ANTLR start "ftsNot"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:152:1: ftsNot : ( MINUS ftsTest -> ^( NEGATION ftsTest ) | ftsTest -> ftsTest );
     public final FTSParser.ftsNot_return ftsNot() throws RecognitionException {
         FTSParser.ftsNot_return retval = new FTSParser.ftsNot_return();
         retval.start = input.LT(1);
@@ -651,7 +657,7 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_MINUS=new RewriteRuleTokenStream(adaptor,"token MINUS");
         RewriteRuleSubtreeStream stream_ftsTest=new RewriteRuleSubtreeStream(adaptor,"rule ftsTest");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:156:5: ( MINUS ftsTest -> ^( NEGATION ftsTest ) | ftsTest -> ftsTest )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:153:5: ( MINUS ftsTest -> ^( NEGATION ftsTest ) | ftsTest -> ftsTest )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -669,12 +675,12 @@ public class FTSParser extends Parser {
             }
             switch (alt6) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:156:7: MINUS ftsTest
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:153:7: MINUS ftsTest
                     {
-                    MINUS13=(Token)match(input,MINUS,FOLLOW_MINUS_in_ftsNot286);  
+                    MINUS13=(Token)match(input,MINUS,FOLLOW_MINUS_in_ftsNot285);  
                     stream_MINUS.add(MINUS13);
 
-                    pushFollow(FOLLOW_ftsTest_in_ftsNot288);
+                    pushFollow(FOLLOW_ftsTest_in_ftsNot287);
                     ftsTest14=ftsTest();
 
                     state._fsp--;
@@ -688,13 +694,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 157:3: -> ^( NEGATION ftsTest )
+                    // 154:3: -> ^( NEGATION ftsTest )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:157:6: ^( NEGATION ftsTest )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:154:6: ^( NEGATION ftsTest )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(NEGATION, "NEGATION"), root_1);
@@ -706,13 +713,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:158:4: ftsTest
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:155:4: ftsTest
                     {
-                    pushFollow(FOLLOW_ftsTest_in_ftsNot303);
+                    pushFollow(FOLLOW_ftsTest_in_ftsNot302);
                     ftsTest15=ftsTest();
 
                     state._fsp--;
@@ -726,17 +733,18 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 159:3: -> ftsTest
+                    // 156:3: -> ftsTest
                     {
                         adaptor.addChild(root_0, stream_ftsTest.nextTree());
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
 
@@ -756,15 +764,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsNot
+    // $ANTLR end "ftsNot"
 
     public static class ftsTest_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsTest
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:162:1: ftsTest : ( ftsTerm -> ^( TERM ftsTerm ) | ftsExactTerm -> ^( EXACT_TERM ftsExactTerm ) | ftsPhrase -> ^( PHRASE ftsPhrase ) | ftsSynonym -> ^( SYNONYM ftsSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | ftsFieldGroup | LPAREN ftsImplicitConjunctionOrDisjunction RPAREN -> ftsImplicitConjunctionOrDisjunction );
+    // $ANTLR start "ftsTest"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:159:1: ftsTest : ( ftsTerm -> ^( TERM ftsTerm ) | ftsExactTerm -> ^( EXACT_TERM ftsExactTerm ) | ftsPhrase -> ^( PHRASE ftsPhrase ) | ftsSynonym -> ^( SYNONYM ftsSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | ftsFieldGroup | LPAREN ftsImplicitConjunctionOrDisjunction RPAREN -> ftsImplicitConjunctionOrDisjunction );
     public final FTSParser.ftsTest_return ftsTest() throws RecognitionException {
         FTSParser.ftsTest_return retval = new FTSParser.ftsTest_return();
         retval.start = input.LT(1);
@@ -802,14 +810,14 @@ public class FTSParser extends Parser {
         RewriteRuleSubtreeStream stream_ftsSynonym=new RewriteRuleSubtreeStream(adaptor,"rule ftsSynonym");
         RewriteRuleSubtreeStream stream_ftsFieldGroupProximity=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupProximity");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:163:5: ( ftsTerm -> ^( TERM ftsTerm ) | ftsExactTerm -> ^( EXACT_TERM ftsExactTerm ) | ftsPhrase -> ^( PHRASE ftsPhrase ) | ftsSynonym -> ^( SYNONYM ftsSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | ftsFieldGroup | LPAREN ftsImplicitConjunctionOrDisjunction RPAREN -> ftsImplicitConjunctionOrDisjunction )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:160:5: ( ftsTerm -> ^( TERM ftsTerm ) | ftsExactTerm -> ^( EXACT_TERM ftsExactTerm ) | ftsPhrase -> ^( PHRASE ftsPhrase ) | ftsSynonym -> ^( SYNONYM ftsSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | ftsFieldGroup | LPAREN ftsImplicitConjunctionOrDisjunction RPAREN -> ftsImplicitConjunctionOrDisjunction )
             int alt7=8;
             alt7 = dfa7.predict(input);
             switch (alt7) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:163:7: ftsTerm
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:160:7: ftsTerm
                     {
-                    pushFollow(FOLLOW_ftsTerm_in_ftsTest324);
+                    pushFollow(FOLLOW_ftsTerm_in_ftsTest323);
                     ftsTerm16=ftsTerm();
 
                     state._fsp--;
@@ -823,13 +831,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 164:3: -> ^( TERM ftsTerm )
+                    // 161:3: -> ^( TERM ftsTerm )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:164:6: ^( TERM ftsTerm )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:161:6: ^( TERM ftsTerm )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(TERM, "TERM"), root_1);
@@ -841,13 +850,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:165:4: ftsExactTerm
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:162:4: ftsExactTerm
                     {
-                    pushFollow(FOLLOW_ftsExactTerm_in_ftsTest339);
+                    pushFollow(FOLLOW_ftsExactTerm_in_ftsTest338);
                     ftsExactTerm17=ftsExactTerm();
 
                     state._fsp--;
@@ -861,13 +870,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 166:3: -> ^( EXACT_TERM ftsExactTerm )
+                    // 163:3: -> ^( EXACT_TERM ftsExactTerm )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:166:6: ^( EXACT_TERM ftsExactTerm )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:163:6: ^( EXACT_TERM ftsExactTerm )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(EXACT_TERM, "EXACT_TERM"), root_1);
@@ -879,13 +889,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 3 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:167:9: ftsPhrase
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:164:9: ftsPhrase
                     {
-                    pushFollow(FOLLOW_ftsPhrase_in_ftsTest359);
+                    pushFollow(FOLLOW_ftsPhrase_in_ftsTest358);
                     ftsPhrase18=ftsPhrase();
 
                     state._fsp--;
@@ -899,13 +909,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 168:9: -> ^( PHRASE ftsPhrase )
+                    // 165:9: -> ^( PHRASE ftsPhrase )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:168:12: ^( PHRASE ftsPhrase )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:165:12: ^( PHRASE ftsPhrase )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PHRASE, "PHRASE"), root_1);
@@ -917,13 +928,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 4 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:169:9: ftsSynonym
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:166:9: ftsSynonym
                     {
-                    pushFollow(FOLLOW_ftsSynonym_in_ftsTest385);
+                    pushFollow(FOLLOW_ftsSynonym_in_ftsTest384);
                     ftsSynonym19=ftsSynonym();
 
                     state._fsp--;
@@ -937,13 +948,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 170:9: -> ^( SYNONYM ftsSynonym )
+                    // 167:9: -> ^( SYNONYM ftsSynonym )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:170:12: ^( SYNONYM ftsSynonym )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:167:12: ^( SYNONYM ftsSynonym )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SYNONYM, "SYNONYM"), root_1);
@@ -955,13 +967,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 5 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:171:7: ftsFieldGroupProximity
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:168:7: ftsFieldGroupProximity
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupProximity_in_ftsTest409);
+                    pushFollow(FOLLOW_ftsFieldGroupProximity_in_ftsTest408);
                     ftsFieldGroupProximity20=ftsFieldGroupProximity();
 
                     state._fsp--;
@@ -975,13 +987,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 172:9: -> ^( FG_PROXIMITY ftsFieldGroupProximity )
+                    // 169:9: -> ^( FG_PROXIMITY ftsFieldGroupProximity )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:172:12: ^( FG_PROXIMITY ftsFieldGroupProximity )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:169:12: ^( FG_PROXIMITY ftsFieldGroupProximity )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FG_PROXIMITY, "FG_PROXIMITY"), root_1);
@@ -993,13 +1006,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 6 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:173:8: ftsFieldGroupRange
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:170:8: ftsFieldGroupRange
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupRange_in_ftsTest436);
+                    pushFollow(FOLLOW_ftsFieldGroupRange_in_ftsTest435);
                     ftsFieldGroupRange21=ftsFieldGroupRange();
 
                     state._fsp--;
@@ -1013,13 +1026,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 174:9: -> ^( FG_RANGE ftsFieldGroupRange )
+                    // 171:9: -> ^( FG_RANGE ftsFieldGroupRange )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:174:12: ^( FG_RANGE ftsFieldGroupRange )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:171:12: ^( FG_RANGE ftsFieldGroupRange )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FG_RANGE, "FG_RANGE"), root_1);
@@ -1031,15 +1045,15 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 7 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:175:7: ftsFieldGroup
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:172:7: ftsFieldGroup
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_ftsFieldGroup_in_ftsTest460);
+                    pushFollow(FOLLOW_ftsFieldGroup_in_ftsTest459);
                     ftsFieldGroup22=ftsFieldGroup();
 
                     state._fsp--;
@@ -1049,18 +1063,18 @@ public class FTSParser extends Parser {
                     }
                     break;
                 case 8 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:176:4: LPAREN ftsImplicitConjunctionOrDisjunction RPAREN
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:173:4: LPAREN ftsImplicitConjunctionOrDisjunction RPAREN
                     {
-                    LPAREN23=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_ftsTest469);  
+                    LPAREN23=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_ftsTest468);  
                     stream_LPAREN.add(LPAREN23);
 
-                    pushFollow(FOLLOW_ftsImplicitConjunctionOrDisjunction_in_ftsTest471);
+                    pushFollow(FOLLOW_ftsImplicitConjunctionOrDisjunction_in_ftsTest470);
                     ftsImplicitConjunctionOrDisjunction24=ftsImplicitConjunctionOrDisjunction();
 
                     state._fsp--;
 
                     stream_ftsImplicitConjunctionOrDisjunction.add(ftsImplicitConjunctionOrDisjunction24.getTree());
-                    RPAREN25=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_ftsTest473);  
+                    RPAREN25=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_ftsTest472);  
                     stream_RPAREN.add(RPAREN25);
 
 
@@ -1071,17 +1085,18 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 177:3: -> ftsImplicitConjunctionOrDisjunction
+                    // 174:3: -> ftsImplicitConjunctionOrDisjunction
                     {
                         adaptor.addChild(root_0, stream_ftsImplicitConjunctionOrDisjunction.nextTree());
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
 
@@ -1101,15 +1116,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsTest
+    // $ANTLR end "ftsTest"
 
     public static class ftsTerm_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsTerm
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:180:1: ftsTerm : ( columnReference COLON )? ftsWord -> ftsWord ( columnReference )? ;
+    // $ANTLR start "ftsTerm"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:177:1: ftsTerm : ( columnReference COLON )? ftsWord -> ftsWord ( columnReference )? ;
     public final FTSParser.ftsTerm_return ftsTerm() throws RecognitionException {
         FTSParser.ftsTerm_return retval = new FTSParser.ftsTerm_return();
         retval.start = input.LT(1);
@@ -1127,10 +1142,10 @@ public class FTSParser extends Parser {
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         RewriteRuleSubtreeStream stream_ftsWord=new RewriteRuleSubtreeStream(adaptor,"rule ftsWord");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:181:2: ( ( columnReference COLON )? ftsWord -> ftsWord ( columnReference )? )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:181:4: ( columnReference COLON )? ftsWord
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:178:2: ( ( columnReference COLON )? ftsWord -> ftsWord ( columnReference )? )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:178:4: ( columnReference COLON )? ftsWord
             {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:181:4: ( columnReference COLON )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:178:4: ( columnReference COLON )?
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1143,15 +1158,15 @@ public class FTSParser extends Parser {
             }
             switch (alt8) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:181:5: columnReference COLON
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:178:5: columnReference COLON
                     {
-                    pushFollow(FOLLOW_columnReference_in_ftsTerm491);
+                    pushFollow(FOLLOW_columnReference_in_ftsTerm490);
                     columnReference26=columnReference();
 
                     state._fsp--;
 
                     stream_columnReference.add(columnReference26.getTree());
-                    COLON27=(Token)match(input,COLON,FOLLOW_COLON_in_ftsTerm493);  
+                    COLON27=(Token)match(input,COLON,FOLLOW_COLON_in_ftsTerm492);  
                     stream_COLON.add(COLON27);
 
 
@@ -1160,7 +1175,7 @@ public class FTSParser extends Parser {
 
             }
 
-            pushFollow(FOLLOW_ftsWord_in_ftsTerm497);
+            pushFollow(FOLLOW_ftsWord_in_ftsTerm496);
             ftsWord28=ftsWord();
 
             state._fsp--;
@@ -1169,19 +1184,20 @@ public class FTSParser extends Parser {
 
 
             // AST REWRITE
-            // elements: columnReference, ftsWord
+            // elements: ftsWord, columnReference
             // token labels: 
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 182:3: -> ftsWord ( columnReference )?
+            // 179:3: -> ftsWord ( columnReference )?
             {
                 adaptor.addChild(root_0, stream_ftsWord.nextTree());
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:182:14: ( columnReference )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:179:14: ( columnReference )?
                 if ( stream_columnReference.hasNext() ) {
                     adaptor.addChild(root_0, stream_columnReference.nextTree());
 
@@ -1190,7 +1206,7 @@ public class FTSParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -1208,15 +1224,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsTerm
+    // $ANTLR end "ftsTerm"
 
     public static class ftsExactTerm_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsExactTerm
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:185:1: ftsExactTerm : PLUS ftsTerm -> ftsTerm ;
+    // $ANTLR start "ftsExactTerm"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:182:1: ftsExactTerm : PLUS ftsTerm -> ftsTerm ;
     public final FTSParser.ftsExactTerm_return ftsExactTerm() throws RecognitionException {
         FTSParser.ftsExactTerm_return retval = new FTSParser.ftsExactTerm_return();
         retval.start = input.LT(1);
@@ -1231,13 +1247,13 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_PLUS=new RewriteRuleTokenStream(adaptor,"token PLUS");
         RewriteRuleSubtreeStream stream_ftsTerm=new RewriteRuleSubtreeStream(adaptor,"rule ftsTerm");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:186:2: ( PLUS ftsTerm -> ftsTerm )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:186:4: PLUS ftsTerm
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:183:2: ( PLUS ftsTerm -> ftsTerm )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:183:4: PLUS ftsTerm
             {
-            PLUS29=(Token)match(input,PLUS,FOLLOW_PLUS_in_ftsExactTerm518);  
+            PLUS29=(Token)match(input,PLUS,FOLLOW_PLUS_in_ftsExactTerm517);  
             stream_PLUS.add(PLUS29);
 
-            pushFollow(FOLLOW_ftsTerm_in_ftsExactTerm520);
+            pushFollow(FOLLOW_ftsTerm_in_ftsExactTerm519);
             ftsTerm30=ftsTerm();
 
             state._fsp--;
@@ -1251,17 +1267,18 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 187:3: -> ftsTerm
+            // 184:3: -> ftsTerm
             {
                 adaptor.addChild(root_0, stream_ftsTerm.nextTree());
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -1279,15 +1296,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsExactTerm
+    // $ANTLR end "ftsExactTerm"
 
     public static class ftsPhrase_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsPhrase
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:190:1: ftsPhrase : ( columnReference COLON )? FTSPHRASE -> FTSPHRASE ( columnReference )? ;
+    // $ANTLR start "ftsPhrase"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:187:1: ftsPhrase : ( columnReference COLON )? FTSPHRASE -> FTSPHRASE ( columnReference )? ;
     public final FTSParser.ftsPhrase_return ftsPhrase() throws RecognitionException {
         FTSParser.ftsPhrase_return retval = new FTSParser.ftsPhrase_return();
         retval.start = input.LT(1);
@@ -1305,10 +1322,10 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_FTSPHRASE=new RewriteRuleTokenStream(adaptor,"token FTSPHRASE");
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:191:2: ( ( columnReference COLON )? FTSPHRASE -> FTSPHRASE ( columnReference )? )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:191:6: ( columnReference COLON )? FTSPHRASE
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:188:2: ( ( columnReference COLON )? FTSPHRASE -> FTSPHRASE ( columnReference )? )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:188:6: ( columnReference COLON )? FTSPHRASE
             {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:191:6: ( columnReference COLON )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:188:6: ( columnReference COLON )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1317,15 +1334,15 @@ public class FTSParser extends Parser {
             }
             switch (alt9) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:191:7: columnReference COLON
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:188:7: columnReference COLON
                     {
-                    pushFollow(FOLLOW_columnReference_in_ftsPhrase541);
+                    pushFollow(FOLLOW_columnReference_in_ftsPhrase540);
                     columnReference31=columnReference();
 
                     state._fsp--;
 
                     stream_columnReference.add(columnReference31.getTree());
-                    COLON32=(Token)match(input,COLON,FOLLOW_COLON_in_ftsPhrase543);  
+                    COLON32=(Token)match(input,COLON,FOLLOW_COLON_in_ftsPhrase542);  
                     stream_COLON.add(COLON32);
 
 
@@ -1334,7 +1351,7 @@ public class FTSParser extends Parser {
 
             }
 
-            FTSPHRASE33=(Token)match(input,FTSPHRASE,FOLLOW_FTSPHRASE_in_ftsPhrase547);  
+            FTSPHRASE33=(Token)match(input,FTSPHRASE,FOLLOW_FTSPHRASE_in_ftsPhrase546);  
             stream_FTSPHRASE.add(FTSPHRASE33);
 
 
@@ -1345,14 +1362,15 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 192:3: -> FTSPHRASE ( columnReference )?
+            // 189:3: -> FTSPHRASE ( columnReference )?
             {
                 adaptor.addChild(root_0, stream_FTSPHRASE.nextNode());
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:192:16: ( columnReference )?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:189:16: ( columnReference )?
                 if ( stream_columnReference.hasNext() ) {
                     adaptor.addChild(root_0, stream_columnReference.nextTree());
 
@@ -1361,7 +1379,7 @@ public class FTSParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -1379,15 +1397,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsPhrase
+    // $ANTLR end "ftsPhrase"
 
     public static class ftsSynonym_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsSynonym
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:195:1: ftsSynonym : TILDA ftsTerm -> ftsTerm ;
+    // $ANTLR start "ftsSynonym"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:192:1: ftsSynonym : TILDA ftsTerm -> ftsTerm ;
     public final FTSParser.ftsSynonym_return ftsSynonym() throws RecognitionException {
         FTSParser.ftsSynonym_return retval = new FTSParser.ftsSynonym_return();
         retval.start = input.LT(1);
@@ -1402,13 +1420,13 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_TILDA=new RewriteRuleTokenStream(adaptor,"token TILDA");
         RewriteRuleSubtreeStream stream_ftsTerm=new RewriteRuleSubtreeStream(adaptor,"rule ftsTerm");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:196:2: ( TILDA ftsTerm -> ftsTerm )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:196:4: TILDA ftsTerm
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:193:2: ( TILDA ftsTerm -> ftsTerm )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:193:4: TILDA ftsTerm
             {
-            TILDA34=(Token)match(input,TILDA,FOLLOW_TILDA_in_ftsSynonym568);  
+            TILDA34=(Token)match(input,TILDA,FOLLOW_TILDA_in_ftsSynonym567);  
             stream_TILDA.add(TILDA34);
 
-            pushFollow(FOLLOW_ftsTerm_in_ftsSynonym570);
+            pushFollow(FOLLOW_ftsTerm_in_ftsSynonym569);
             ftsTerm35=ftsTerm();
 
             state._fsp--;
@@ -1422,17 +1440,18 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 197:3: -> ftsTerm
+            // 194:3: -> ftsTerm
             {
                 adaptor.addChild(root_0, stream_ftsTerm.nextTree());
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -1450,15 +1469,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsSynonym
+    // $ANTLR end "ftsSynonym"
 
     public static class ftsFieldGroup_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroup
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:201:1: ftsFieldGroup : columnReference COLON LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN -> ^( FIELD_GROUP columnReference ftsFieldGroupImplicitConjunctionOrDisjunction ) ;
+    // $ANTLR start "ftsFieldGroup"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:198:1: ftsFieldGroup : columnReference COLON LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN -> ^( FIELD_GROUP columnReference ftsFieldGroupImplicitConjunctionOrDisjunction ) ;
     public final FTSParser.ftsFieldGroup_return ftsFieldGroup() throws RecognitionException {
         FTSParser.ftsFieldGroup_return retval = new FTSParser.ftsFieldGroup_return();
         retval.start = input.LT(1);
@@ -1482,28 +1501,28 @@ public class FTSParser extends Parser {
         RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
         RewriteRuleSubtreeStream stream_ftsFieldGroupImplicitConjunctionOrDisjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupImplicitConjunctionOrDisjunction");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:202:2: ( columnReference COLON LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN -> ^( FIELD_GROUP columnReference ftsFieldGroupImplicitConjunctionOrDisjunction ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:202:4: columnReference COLON LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:199:2: ( columnReference COLON LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN -> ^( FIELD_GROUP columnReference ftsFieldGroupImplicitConjunctionOrDisjunction ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:199:4: columnReference COLON LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN
             {
-            pushFollow(FOLLOW_columnReference_in_ftsFieldGroup589);
+            pushFollow(FOLLOW_columnReference_in_ftsFieldGroup588);
             columnReference36=columnReference();
 
             state._fsp--;
 
             stream_columnReference.add(columnReference36.getTree());
-            COLON37=(Token)match(input,COLON,FOLLOW_COLON_in_ftsFieldGroup591);  
+            COLON37=(Token)match(input,COLON,FOLLOW_COLON_in_ftsFieldGroup590);  
             stream_COLON.add(COLON37);
 
-            LPAREN38=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_ftsFieldGroup593);  
+            LPAREN38=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_ftsFieldGroup592);  
             stream_LPAREN.add(LPAREN38);
 
-            pushFollow(FOLLOW_ftsFieldGroupImplicitConjunctionOrDisjunction_in_ftsFieldGroup595);
+            pushFollow(FOLLOW_ftsFieldGroupImplicitConjunctionOrDisjunction_in_ftsFieldGroup594);
             ftsFieldGroupImplicitConjunctionOrDisjunction39=ftsFieldGroupImplicitConjunctionOrDisjunction();
 
             state._fsp--;
 
             stream_ftsFieldGroupImplicitConjunctionOrDisjunction.add(ftsFieldGroupImplicitConjunctionOrDisjunction39.getTree());
-            RPAREN40=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_ftsFieldGroup597);  
+            RPAREN40=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_ftsFieldGroup596);  
             stream_RPAREN.add(RPAREN40);
 
 
@@ -1514,13 +1533,14 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 203:3: -> ^( FIELD_GROUP columnReference ftsFieldGroupImplicitConjunctionOrDisjunction )
+            // 200:3: -> ^( FIELD_GROUP columnReference ftsFieldGroupImplicitConjunctionOrDisjunction )
             {
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:203:6: ^( FIELD_GROUP columnReference ftsFieldGroupImplicitConjunctionOrDisjunction )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:200:6: ^( FIELD_GROUP columnReference ftsFieldGroupImplicitConjunctionOrDisjunction )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FIELD_GROUP, "FIELD_GROUP"), root_1);
@@ -1533,7 +1553,7 @@ public class FTSParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -1551,15 +1571,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroup
+    // $ANTLR end "ftsFieldGroup"
 
     public static class ftsFieldGroupImplicitConjunctionOrDisjunction_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupImplicitConjunctionOrDisjunction
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:206:1: ftsFieldGroupImplicitConjunctionOrDisjunction : ({...}? ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )* -> ^( FIELD_CONJUNCTION ( ftsFieldGroupExplicitDisjunction )+ ) | ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )* -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplicitDisjunction )+ ) );
+    // $ANTLR start "ftsFieldGroupImplicitConjunctionOrDisjunction"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:203:1: ftsFieldGroupImplicitConjunctionOrDisjunction : ({...}? ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )* -> ^( FIELD_CONJUNCTION ( ftsFieldGroupExplicitDisjunction )+ ) | ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )* -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplicitDisjunction )+ ) );
     public final FTSParser.ftsFieldGroupImplicitConjunctionOrDisjunction_return ftsFieldGroupImplicitConjunctionOrDisjunction() throws RecognitionException {
         FTSParser.ftsFieldGroupImplicitConjunctionOrDisjunction_return retval = new FTSParser.ftsFieldGroupImplicitConjunctionOrDisjunction_return();
         retval.start = input.LT(1);
@@ -1577,14 +1597,14 @@ public class FTSParser extends Parser {
 
         RewriteRuleSubtreeStream stream_ftsFieldGroupExplicitDisjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupExplicitDisjunction");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:207:2: ({...}? ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )* -> ^( FIELD_CONJUNCTION ( ftsFieldGroupExplicitDisjunction )+ ) | ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )* -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplicitDisjunction )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:204:2: ({...}? ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )* -> ^( FIELD_CONJUNCTION ( ftsFieldGroupExplicitDisjunction )+ ) | ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )* -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplicitDisjunction )+ ) )
             int alt12=2;
             switch ( input.LA(1) ) {
             case MINUS:
                 {
                 int LA12_1 = input.LA(2);
 
-                if ( (defaultFieldConjunction()) ) {
+                if ( ((defaultFieldConjunction())) ) {
                     alt12=1;
                 }
                 else if ( (true) ) {
@@ -1603,7 +1623,7 @@ public class FTSParser extends Parser {
                 {
                 int LA12_2 = input.LA(2);
 
-                if ( (defaultFieldConjunction()) ) {
+                if ( ((defaultFieldConjunction())) ) {
                     alt12=1;
                 }
                 else if ( (true) ) {
@@ -1621,7 +1641,7 @@ public class FTSParser extends Parser {
                 {
                 int LA12_3 = input.LA(2);
 
-                if ( (defaultFieldConjunction()) ) {
+                if ( ((defaultFieldConjunction())) ) {
                     alt12=1;
                 }
                 else if ( (true) ) {
@@ -1639,7 +1659,7 @@ public class FTSParser extends Parser {
                 {
                 int LA12_4 = input.LA(2);
 
-                if ( (defaultFieldConjunction()) ) {
+                if ( ((defaultFieldConjunction())) ) {
                     alt12=1;
                 }
                 else if ( (true) ) {
@@ -1657,7 +1677,7 @@ public class FTSParser extends Parser {
                 {
                 int LA12_5 = input.LA(2);
 
-                if ( (defaultFieldConjunction()) ) {
+                if ( ((defaultFieldConjunction())) ) {
                     alt12=1;
                 }
                 else if ( (true) ) {
@@ -1675,7 +1695,7 @@ public class FTSParser extends Parser {
                 {
                 int LA12_6 = input.LA(2);
 
-                if ( (defaultFieldConjunction()) ) {
+                if ( ((defaultFieldConjunction())) ) {
                     alt12=1;
                 }
                 else if ( (true) ) {
@@ -1698,18 +1718,18 @@ public class FTSParser extends Parser {
 
             switch (alt12) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:207:4: {...}? ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:204:4: {...}? ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )*
                     {
-                    if ( !(defaultFieldConjunction()) ) {
+                    if ( !((defaultFieldConjunction())) ) {
                         throw new FailedPredicateException(input, "ftsFieldGroupImplicitConjunctionOrDisjunction", "defaultFieldConjunction()");
                     }
-                    pushFollow(FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction623);
+                    pushFollow(FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction622);
                     ftsFieldGroupExplicitDisjunction41=ftsFieldGroupExplicitDisjunction();
 
                     state._fsp--;
 
                     stream_ftsFieldGroupExplicitDisjunction.add(ftsFieldGroupExplicitDisjunction41.getTree());
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:207:66: ( ftsFieldGroupExplicitDisjunction )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:204:66: ( ftsFieldGroupExplicitDisjunction )*
                     loop10:
                     do {
                         int alt10=2;
@@ -1722,9 +1742,9 @@ public class FTSParser extends Parser {
 
                         switch (alt10) {
                     	case 1 :
-                    	    // W:\\workspace-cmis\\ANTLR\\FTS.g:207:67: ftsFieldGroupExplicitDisjunction
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:204:67: ftsFieldGroupExplicitDisjunction
                     	    {
-                    	    pushFollow(FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction626);
+                    	    pushFollow(FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction625);
                     	    ftsFieldGroupExplicitDisjunction42=ftsFieldGroupExplicitDisjunction();
 
                     	    state._fsp--;
@@ -1747,13 +1767,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 208:3: -> ^( FIELD_CONJUNCTION ( ftsFieldGroupExplicitDisjunction )+ )
+                    // 205:3: -> ^( FIELD_CONJUNCTION ( ftsFieldGroupExplicitDisjunction )+ )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:208:6: ^( FIELD_CONJUNCTION ( ftsFieldGroupExplicitDisjunction )+ )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:205:6: ^( FIELD_CONJUNCTION ( ftsFieldGroupExplicitDisjunction )+ )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FIELD_CONJUNCTION, "FIELD_CONJUNCTION"), root_1);
@@ -1772,19 +1793,19 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:209:4: ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:206:4: ftsFieldGroupExplicitDisjunction ( ftsFieldGroupExplicitDisjunction )*
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction644);
+                    pushFollow(FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction643);
                     ftsFieldGroupExplicitDisjunction43=ftsFieldGroupExplicitDisjunction();
 
                     state._fsp--;
 
                     stream_ftsFieldGroupExplicitDisjunction.add(ftsFieldGroupExplicitDisjunction43.getTree());
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:209:37: ( ftsFieldGroupExplicitDisjunction )*
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:206:37: ( ftsFieldGroupExplicitDisjunction )*
                     loop11:
                     do {
                         int alt11=2;
@@ -1797,9 +1818,9 @@ public class FTSParser extends Parser {
 
                         switch (alt11) {
                     	case 1 :
-                    	    // W:\\workspace-cmis\\ANTLR\\FTS.g:209:38: ftsFieldGroupExplicitDisjunction
+                    	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:206:38: ftsFieldGroupExplicitDisjunction
                     	    {
-                    	    pushFollow(FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction647);
+                    	    pushFollow(FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction646);
                     	    ftsFieldGroupExplicitDisjunction44=ftsFieldGroupExplicitDisjunction();
 
                     	    state._fsp--;
@@ -1822,13 +1843,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 210:3: -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplicitDisjunction )+ )
+                    // 207:3: -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplicitDisjunction )+ )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:210:6: ^( FIELD_DISJUNCTION ( ftsFieldGroupExplicitDisjunction )+ )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:207:6: ^( FIELD_DISJUNCTION ( ftsFieldGroupExplicitDisjunction )+ )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FIELD_DISJUNCTION, "FIELD_DISJUNCTION"), root_1);
@@ -1847,7 +1869,7 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
 
@@ -1867,15 +1889,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupImplicitConjunctionOrDisjunction
+    // $ANTLR end "ftsFieldGroupImplicitConjunctionOrDisjunction"
 
     public static class ftsFieldGroupExplicitDisjunction_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupExplicitDisjunction
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:213:1: ftsFieldGroupExplicitDisjunction : ftsFieldGroupExplictConjunction ( OR ftsFieldGroupExplictConjunction )* -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplictConjunction )+ ) ;
+    // $ANTLR start "ftsFieldGroupExplicitDisjunction"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:210:1: ftsFieldGroupExplicitDisjunction : ftsFieldGroupExplictConjunction ( OR ftsFieldGroupExplictConjunction )* -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplictConjunction )+ ) ;
     public final FTSParser.ftsFieldGroupExplicitDisjunction_return ftsFieldGroupExplicitDisjunction() throws RecognitionException {
         FTSParser.ftsFieldGroupExplicitDisjunction_return retval = new FTSParser.ftsFieldGroupExplicitDisjunction_return();
         retval.start = input.LT(1);
@@ -1892,16 +1914,16 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_OR=new RewriteRuleTokenStream(adaptor,"token OR");
         RewriteRuleSubtreeStream stream_ftsFieldGroupExplictConjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupExplictConjunction");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:214:2: ( ftsFieldGroupExplictConjunction ( OR ftsFieldGroupExplictConjunction )* -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplictConjunction )+ ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:214:4: ftsFieldGroupExplictConjunction ( OR ftsFieldGroupExplictConjunction )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:211:2: ( ftsFieldGroupExplictConjunction ( OR ftsFieldGroupExplictConjunction )* -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplictConjunction )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:211:4: ftsFieldGroupExplictConjunction ( OR ftsFieldGroupExplictConjunction )*
             {
-            pushFollow(FOLLOW_ftsFieldGroupExplictConjunction_in_ftsFieldGroupExplicitDisjunction672);
+            pushFollow(FOLLOW_ftsFieldGroupExplictConjunction_in_ftsFieldGroupExplicitDisjunction671);
             ftsFieldGroupExplictConjunction45=ftsFieldGroupExplictConjunction();
 
             state._fsp--;
 
             stream_ftsFieldGroupExplictConjunction.add(ftsFieldGroupExplictConjunction45.getTree());
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:214:36: ( OR ftsFieldGroupExplictConjunction )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:211:36: ( OR ftsFieldGroupExplictConjunction )*
             loop13:
             do {
                 int alt13=2;
@@ -1914,12 +1936,12 @@ public class FTSParser extends Parser {
 
                 switch (alt13) {
             	case 1 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:214:37: OR ftsFieldGroupExplictConjunction
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:211:37: OR ftsFieldGroupExplictConjunction
             	    {
-            	    OR46=(Token)match(input,OR,FOLLOW_OR_in_ftsFieldGroupExplicitDisjunction675);  
+            	    OR46=(Token)match(input,OR,FOLLOW_OR_in_ftsFieldGroupExplicitDisjunction674);  
             	    stream_OR.add(OR46);
 
-            	    pushFollow(FOLLOW_ftsFieldGroupExplictConjunction_in_ftsFieldGroupExplicitDisjunction677);
+            	    pushFollow(FOLLOW_ftsFieldGroupExplictConjunction_in_ftsFieldGroupExplicitDisjunction676);
             	    ftsFieldGroupExplictConjunction47=ftsFieldGroupExplictConjunction();
 
             	    state._fsp--;
@@ -1942,13 +1964,14 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 215:3: -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplictConjunction )+ )
+            // 212:3: -> ^( FIELD_DISJUNCTION ( ftsFieldGroupExplictConjunction )+ )
             {
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:215:6: ^( FIELD_DISJUNCTION ( ftsFieldGroupExplictConjunction )+ )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:212:6: ^( FIELD_DISJUNCTION ( ftsFieldGroupExplictConjunction )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FIELD_DISJUNCTION, "FIELD_DISJUNCTION"), root_1);
@@ -1967,7 +1990,7 @@ public class FTSParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -1985,15 +2008,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupExplicitDisjunction
+    // $ANTLR end "ftsFieldGroupExplicitDisjunction"
 
     public static class ftsFieldGroupExplictConjunction_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupExplictConjunction
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:218:1: ftsFieldGroupExplictConjunction : ftsFieldGroupNot ( AND ftsFieldGroupNot )* -> ^( FIELD_CONJUNCTION ( ftsFieldGroupNot )+ ) ;
+    // $ANTLR start "ftsFieldGroupExplictConjunction"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:215:1: ftsFieldGroupExplictConjunction : ftsFieldGroupNot ( AND ftsFieldGroupNot )* -> ^( FIELD_CONJUNCTION ( ftsFieldGroupNot )+ ) ;
     public final FTSParser.ftsFieldGroupExplictConjunction_return ftsFieldGroupExplictConjunction() throws RecognitionException {
         FTSParser.ftsFieldGroupExplictConjunction_return retval = new FTSParser.ftsFieldGroupExplictConjunction_return();
         retval.start = input.LT(1);
@@ -2010,16 +2033,16 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_AND=new RewriteRuleTokenStream(adaptor,"token AND");
         RewriteRuleSubtreeStream stream_ftsFieldGroupNot=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupNot");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:219:2: ( ftsFieldGroupNot ( AND ftsFieldGroupNot )* -> ^( FIELD_CONJUNCTION ( ftsFieldGroupNot )+ ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:219:4: ftsFieldGroupNot ( AND ftsFieldGroupNot )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:216:2: ( ftsFieldGroupNot ( AND ftsFieldGroupNot )* -> ^( FIELD_CONJUNCTION ( ftsFieldGroupNot )+ ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:216:4: ftsFieldGroupNot ( AND ftsFieldGroupNot )*
             {
-            pushFollow(FOLLOW_ftsFieldGroupNot_in_ftsFieldGroupExplictConjunction702);
+            pushFollow(FOLLOW_ftsFieldGroupNot_in_ftsFieldGroupExplictConjunction701);
             ftsFieldGroupNot48=ftsFieldGroupNot();
 
             state._fsp--;
 
             stream_ftsFieldGroupNot.add(ftsFieldGroupNot48.getTree());
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:219:21: ( AND ftsFieldGroupNot )*
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:216:21: ( AND ftsFieldGroupNot )*
             loop14:
             do {
                 int alt14=2;
@@ -2032,12 +2055,12 @@ public class FTSParser extends Parser {
 
                 switch (alt14) {
             	case 1 :
-            	    // W:\\workspace-cmis\\ANTLR\\FTS.g:219:22: AND ftsFieldGroupNot
+            	    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:216:22: AND ftsFieldGroupNot
             	    {
-            	    AND49=(Token)match(input,AND,FOLLOW_AND_in_ftsFieldGroupExplictConjunction705);  
+            	    AND49=(Token)match(input,AND,FOLLOW_AND_in_ftsFieldGroupExplictConjunction704);  
             	    stream_AND.add(AND49);
 
-            	    pushFollow(FOLLOW_ftsFieldGroupNot_in_ftsFieldGroupExplictConjunction707);
+            	    pushFollow(FOLLOW_ftsFieldGroupNot_in_ftsFieldGroupExplictConjunction706);
             	    ftsFieldGroupNot50=ftsFieldGroupNot();
 
             	    state._fsp--;
@@ -2060,13 +2083,14 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 220:3: -> ^( FIELD_CONJUNCTION ( ftsFieldGroupNot )+ )
+            // 217:3: -> ^( FIELD_CONJUNCTION ( ftsFieldGroupNot )+ )
             {
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:220:6: ^( FIELD_CONJUNCTION ( ftsFieldGroupNot )+ )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:217:6: ^( FIELD_CONJUNCTION ( ftsFieldGroupNot )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FIELD_CONJUNCTION, "FIELD_CONJUNCTION"), root_1);
@@ -2085,7 +2109,7 @@ public class FTSParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -2103,15 +2127,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupExplictConjunction
+    // $ANTLR end "ftsFieldGroupExplictConjunction"
 
     public static class ftsFieldGroupNot_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupNot
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:224:1: ftsFieldGroupNot : ( MINUS ftsFieldGroupTest -> FIELD_NEGATION ftsFieldGroupTest | ftsFieldGroupTest -> ftsFieldGroupTest );
+    // $ANTLR start "ftsFieldGroupNot"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:221:1: ftsFieldGroupNot : ( MINUS ftsFieldGroupTest -> FIELD_NEGATION ftsFieldGroupTest | ftsFieldGroupTest -> ftsFieldGroupTest );
     public final FTSParser.ftsFieldGroupNot_return ftsFieldGroupNot() throws RecognitionException {
         FTSParser.ftsFieldGroupNot_return retval = new FTSParser.ftsFieldGroupNot_return();
         retval.start = input.LT(1);
@@ -2128,7 +2152,7 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_MINUS=new RewriteRuleTokenStream(adaptor,"token MINUS");
         RewriteRuleSubtreeStream stream_ftsFieldGroupTest=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupTest");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:224:19: ( MINUS ftsFieldGroupTest -> FIELD_NEGATION ftsFieldGroupTest | ftsFieldGroupTest -> ftsFieldGroupTest )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:221:19: ( MINUS ftsFieldGroupTest -> FIELD_NEGATION ftsFieldGroupTest | ftsFieldGroupTest -> ftsFieldGroupTest )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2146,12 +2170,12 @@ public class FTSParser extends Parser {
             }
             switch (alt15) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:224:21: MINUS ftsFieldGroupTest
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:221:21: MINUS ftsFieldGroupTest
                     {
-                    MINUS51=(Token)match(input,MINUS,FOLLOW_MINUS_in_ftsFieldGroupNot734);  
+                    MINUS51=(Token)match(input,MINUS,FOLLOW_MINUS_in_ftsFieldGroupNot733);  
                     stream_MINUS.add(MINUS51);
 
-                    pushFollow(FOLLOW_ftsFieldGroupTest_in_ftsFieldGroupNot736);
+                    pushFollow(FOLLOW_ftsFieldGroupTest_in_ftsFieldGroupNot735);
                     ftsFieldGroupTest52=ftsFieldGroupTest();
 
                     state._fsp--;
@@ -2165,24 +2189,25 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 225:4: -> FIELD_NEGATION ftsFieldGroupTest
+                    // 222:4: -> FIELD_NEGATION ftsFieldGroupTest
                     {
                         adaptor.addChild(root_0, (Object)adaptor.create(FIELD_NEGATION, "FIELD_NEGATION"));
                         adaptor.addChild(root_0, stream_ftsFieldGroupTest.nextTree());
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:226:5: ftsFieldGroupTest
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:223:5: ftsFieldGroupTest
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupTest_in_ftsFieldGroupNot751);
+                    pushFollow(FOLLOW_ftsFieldGroupTest_in_ftsFieldGroupNot750);
                     ftsFieldGroupTest53=ftsFieldGroupTest();
 
                     state._fsp--;
@@ -2196,17 +2221,18 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 227:4: -> ftsFieldGroupTest
+                    // 224:4: -> ftsFieldGroupTest
                     {
                         adaptor.addChild(root_0, stream_ftsFieldGroupTest.nextTree());
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
 
@@ -2226,15 +2252,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupNot
+    // $ANTLR end "ftsFieldGroupNot"
 
     public static class ftsFieldGroupTest_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupTest
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:231:1: ftsFieldGroupTest : ( ftsFieldGroupTerm -> ^( FG_TERM ftsFieldGroupTerm ) | ftsFieldGroupExactTerm -> ^( FG_EXACT_TERM ftsFieldGroupExactTerm ) | ftsFieldGroupPhrase -> ^( FG_PHRASE ftsFieldGroupPhrase ) | ftsFieldGroupSynonym -> ^( FG_SYNONYM ftsFieldGroupSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN -> ftsFieldGroupImplicitConjunctionOrDisjunction );
+    // $ANTLR start "ftsFieldGroupTest"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:228:1: ftsFieldGroupTest : ( ftsFieldGroupTerm -> ^( FG_TERM ftsFieldGroupTerm ) | ftsFieldGroupExactTerm -> ^( FG_EXACT_TERM ftsFieldGroupExactTerm ) | ftsFieldGroupPhrase -> ^( FG_PHRASE ftsFieldGroupPhrase ) | ftsFieldGroupSynonym -> ^( FG_SYNONYM ftsFieldGroupSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN -> ftsFieldGroupImplicitConjunctionOrDisjunction );
     public final FTSParser.ftsFieldGroupTest_return ftsFieldGroupTest() throws RecognitionException {
         FTSParser.ftsFieldGroupTest_return retval = new FTSParser.ftsFieldGroupTest_return();
         retval.start = input.LT(1);
@@ -2270,7 +2296,7 @@ public class FTSParser extends Parser {
         RewriteRuleSubtreeStream stream_ftsFieldGroupExactTerm=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupExactTerm");
         RewriteRuleSubtreeStream stream_ftsFieldGroupProximity=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupProximity");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:232:2: ( ftsFieldGroupTerm -> ^( FG_TERM ftsFieldGroupTerm ) | ftsFieldGroupExactTerm -> ^( FG_EXACT_TERM ftsFieldGroupExactTerm ) | ftsFieldGroupPhrase -> ^( FG_PHRASE ftsFieldGroupPhrase ) | ftsFieldGroupSynonym -> ^( FG_SYNONYM ftsFieldGroupSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN -> ftsFieldGroupImplicitConjunctionOrDisjunction )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:229:2: ( ftsFieldGroupTerm -> ^( FG_TERM ftsFieldGroupTerm ) | ftsFieldGroupExactTerm -> ^( FG_EXACT_TERM ftsFieldGroupExactTerm ) | ftsFieldGroupPhrase -> ^( FG_PHRASE ftsFieldGroupPhrase ) | ftsFieldGroupSynonym -> ^( FG_SYNONYM ftsFieldGroupSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN -> ftsFieldGroupImplicitConjunctionOrDisjunction )
             int alt16=7;
             switch ( input.LA(1) ) {
             case ID:
@@ -2339,9 +2365,9 @@ public class FTSParser extends Parser {
 
             switch (alt16) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:232:4: ftsFieldGroupTerm
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:229:4: ftsFieldGroupTerm
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupTest770);
+                    pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupTest769);
                     ftsFieldGroupTerm54=ftsFieldGroupTerm();
 
                     state._fsp--;
@@ -2355,13 +2381,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 233:3: -> ^( FG_TERM ftsFieldGroupTerm )
+                    // 230:3: -> ^( FG_TERM ftsFieldGroupTerm )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:233:6: ^( FG_TERM ftsFieldGroupTerm )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:230:6: ^( FG_TERM ftsFieldGroupTerm )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FG_TERM, "FG_TERM"), root_1);
@@ -2373,13 +2400,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 2 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:234:4: ftsFieldGroupExactTerm
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:231:4: ftsFieldGroupExactTerm
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupExactTerm_in_ftsFieldGroupTest785);
+                    pushFollow(FOLLOW_ftsFieldGroupExactTerm_in_ftsFieldGroupTest784);
                     ftsFieldGroupExactTerm55=ftsFieldGroupExactTerm();
 
                     state._fsp--;
@@ -2393,13 +2420,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 235:3: -> ^( FG_EXACT_TERM ftsFieldGroupExactTerm )
+                    // 232:3: -> ^( FG_EXACT_TERM ftsFieldGroupExactTerm )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:235:6: ^( FG_EXACT_TERM ftsFieldGroupExactTerm )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:232:6: ^( FG_EXACT_TERM ftsFieldGroupExactTerm )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FG_EXACT_TERM, "FG_EXACT_TERM"), root_1);
@@ -2411,13 +2439,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 3 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:236:4: ftsFieldGroupPhrase
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:233:4: ftsFieldGroupPhrase
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupPhrase_in_ftsFieldGroupTest801);
+                    pushFollow(FOLLOW_ftsFieldGroupPhrase_in_ftsFieldGroupTest800);
                     ftsFieldGroupPhrase56=ftsFieldGroupPhrase();
 
                     state._fsp--;
@@ -2431,13 +2459,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 237:3: -> ^( FG_PHRASE ftsFieldGroupPhrase )
+                    // 234:3: -> ^( FG_PHRASE ftsFieldGroupPhrase )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:237:6: ^( FG_PHRASE ftsFieldGroupPhrase )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:234:6: ^( FG_PHRASE ftsFieldGroupPhrase )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FG_PHRASE, "FG_PHRASE"), root_1);
@@ -2449,13 +2478,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 4 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:238:4: ftsFieldGroupSynonym
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:235:4: ftsFieldGroupSynonym
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupSynonym_in_ftsFieldGroupTest816);
+                    pushFollow(FOLLOW_ftsFieldGroupSynonym_in_ftsFieldGroupTest815);
                     ftsFieldGroupSynonym57=ftsFieldGroupSynonym();
 
                     state._fsp--;
@@ -2469,13 +2498,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 239:3: -> ^( FG_SYNONYM ftsFieldGroupSynonym )
+                    // 236:3: -> ^( FG_SYNONYM ftsFieldGroupSynonym )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:239:6: ^( FG_SYNONYM ftsFieldGroupSynonym )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:236:6: ^( FG_SYNONYM ftsFieldGroupSynonym )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FG_SYNONYM, "FG_SYNONYM"), root_1);
@@ -2487,13 +2517,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 5 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:240:6: ftsFieldGroupProximity
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:237:6: ftsFieldGroupProximity
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupProximity_in_ftsFieldGroupTest833);
+                    pushFollow(FOLLOW_ftsFieldGroupProximity_in_ftsFieldGroupTest832);
                     ftsFieldGroupProximity58=ftsFieldGroupProximity();
 
                     state._fsp--;
@@ -2507,13 +2537,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 241:3: -> ^( FG_PROXIMITY ftsFieldGroupProximity )
+                    // 238:3: -> ^( FG_PROXIMITY ftsFieldGroupProximity )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:241:6: ^( FG_PROXIMITY ftsFieldGroupProximity )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:238:6: ^( FG_PROXIMITY ftsFieldGroupProximity )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FG_PROXIMITY, "FG_PROXIMITY"), root_1);
@@ -2525,13 +2556,13 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 6 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:242:8: ftsFieldGroupRange
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:239:8: ftsFieldGroupRange
                     {
-                    pushFollow(FOLLOW_ftsFieldGroupRange_in_ftsFieldGroupTest854);
+                    pushFollow(FOLLOW_ftsFieldGroupRange_in_ftsFieldGroupTest853);
                     ftsFieldGroupRange59=ftsFieldGroupRange();
 
                     state._fsp--;
@@ -2545,13 +2576,14 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 243:9: -> ^( FG_RANGE ftsFieldGroupRange )
+                    // 240:9: -> ^( FG_RANGE ftsFieldGroupRange )
                     {
-                        // W:\\workspace-cmis\\ANTLR\\FTS.g:243:12: ^( FG_RANGE ftsFieldGroupRange )
+                        // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:240:12: ^( FG_RANGE ftsFieldGroupRange )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FG_RANGE, "FG_RANGE"), root_1);
@@ -2563,22 +2595,22 @@ public class FTSParser extends Parser {
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
                 case 7 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:244:4: LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:241:4: LPAREN ftsFieldGroupImplicitConjunctionOrDisjunction RPAREN
                     {
-                    LPAREN60=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_ftsFieldGroupTest875);  
+                    LPAREN60=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_ftsFieldGroupTest874);  
                     stream_LPAREN.add(LPAREN60);
 
-                    pushFollow(FOLLOW_ftsFieldGroupImplicitConjunctionOrDisjunction_in_ftsFieldGroupTest877);
+                    pushFollow(FOLLOW_ftsFieldGroupImplicitConjunctionOrDisjunction_in_ftsFieldGroupTest876);
                     ftsFieldGroupImplicitConjunctionOrDisjunction61=ftsFieldGroupImplicitConjunctionOrDisjunction();
 
                     state._fsp--;
 
                     stream_ftsFieldGroupImplicitConjunctionOrDisjunction.add(ftsFieldGroupImplicitConjunctionOrDisjunction61.getTree());
-                    RPAREN62=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_ftsFieldGroupTest879);  
+                    RPAREN62=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_ftsFieldGroupTest878);  
                     stream_RPAREN.add(RPAREN62);
 
 
@@ -2589,17 +2621,18 @@ public class FTSParser extends Parser {
                     // rule labels: retval
                     // token list labels: 
                     // rule list labels: 
+                    // wildcard labels: 
                     retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 245:3: -> ftsFieldGroupImplicitConjunctionOrDisjunction
+                    // 242:3: -> ftsFieldGroupImplicitConjunctionOrDisjunction
                     {
                         adaptor.addChild(root_0, stream_ftsFieldGroupImplicitConjunctionOrDisjunction.nextTree());
 
                     }
 
-                    retval.tree = root_0;retval.tree = root_0;
+                    retval.tree = root_0;
                     }
                     break;
 
@@ -2619,15 +2652,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupTest
+    // $ANTLR end "ftsFieldGroupTest"
 
     public static class ftsFieldGroupTerm_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupTerm
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:248:1: ftsFieldGroupTerm : ftsWord ;
+    // $ANTLR start "ftsFieldGroupTerm"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:245:1: ftsFieldGroupTerm : ftsWord ;
     public final FTSParser.ftsFieldGroupTerm_return ftsFieldGroupTerm() throws RecognitionException {
         FTSParser.ftsFieldGroupTerm_return retval = new FTSParser.ftsFieldGroupTerm_return();
         retval.start = input.LT(1);
@@ -2639,12 +2672,12 @@ public class FTSParser extends Parser {
 
 
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:249:2: ( ftsWord )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:249:4: ftsWord
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:246:2: ( ftsWord )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:246:4: ftsWord
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_ftsWord_in_ftsFieldGroupTerm897);
+            pushFollow(FOLLOW_ftsWord_in_ftsFieldGroupTerm896);
             ftsWord63=ftsWord();
 
             state._fsp--;
@@ -2668,15 +2701,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupTerm
+    // $ANTLR end "ftsFieldGroupTerm"
 
     public static class ftsFieldGroupExactTerm_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupExactTerm
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:252:1: ftsFieldGroupExactTerm : PLUS ftsFieldGroupTerm -> ftsFieldGroupTerm ;
+    // $ANTLR start "ftsFieldGroupExactTerm"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:249:1: ftsFieldGroupExactTerm : PLUS ftsFieldGroupTerm -> ftsFieldGroupTerm ;
     public final FTSParser.ftsFieldGroupExactTerm_return ftsFieldGroupExactTerm() throws RecognitionException {
         FTSParser.ftsFieldGroupExactTerm_return retval = new FTSParser.ftsFieldGroupExactTerm_return();
         retval.start = input.LT(1);
@@ -2691,13 +2724,13 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_PLUS=new RewriteRuleTokenStream(adaptor,"token PLUS");
         RewriteRuleSubtreeStream stream_ftsFieldGroupTerm=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupTerm");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:253:2: ( PLUS ftsFieldGroupTerm -> ftsFieldGroupTerm )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:253:4: PLUS ftsFieldGroupTerm
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:250:2: ( PLUS ftsFieldGroupTerm -> ftsFieldGroupTerm )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:250:4: PLUS ftsFieldGroupTerm
             {
-            PLUS64=(Token)match(input,PLUS,FOLLOW_PLUS_in_ftsFieldGroupExactTerm909);  
+            PLUS64=(Token)match(input,PLUS,FOLLOW_PLUS_in_ftsFieldGroupExactTerm908);  
             stream_PLUS.add(PLUS64);
 
-            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupExactTerm911);
+            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupExactTerm910);
             ftsFieldGroupTerm65=ftsFieldGroupTerm();
 
             state._fsp--;
@@ -2711,17 +2744,18 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 254:3: -> ftsFieldGroupTerm
+            // 251:3: -> ftsFieldGroupTerm
             {
                 adaptor.addChild(root_0, stream_ftsFieldGroupTerm.nextTree());
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -2739,15 +2773,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupExactTerm
+    // $ANTLR end "ftsFieldGroupExactTerm"
 
     public static class ftsFieldGroupPhrase_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupPhrase
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:257:1: ftsFieldGroupPhrase : FTSPHRASE ;
+    // $ANTLR start "ftsFieldGroupPhrase"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:254:1: ftsFieldGroupPhrase : FTSPHRASE ;
     public final FTSParser.ftsFieldGroupPhrase_return ftsFieldGroupPhrase() throws RecognitionException {
         FTSParser.ftsFieldGroupPhrase_return retval = new FTSParser.ftsFieldGroupPhrase_return();
         retval.start = input.LT(1);
@@ -2759,12 +2793,12 @@ public class FTSParser extends Parser {
         Object FTSPHRASE66_tree=null;
 
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:258:2: ( FTSPHRASE )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:258:6: FTSPHRASE
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:255:2: ( FTSPHRASE )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:255:6: FTSPHRASE
             {
             root_0 = (Object)adaptor.nil();
 
-            FTSPHRASE66=(Token)match(input,FTSPHRASE,FOLLOW_FTSPHRASE_in_ftsFieldGroupPhrase931); 
+            FTSPHRASE66=(Token)match(input,FTSPHRASE,FOLLOW_FTSPHRASE_in_ftsFieldGroupPhrase930); 
             FTSPHRASE66_tree = (Object)adaptor.create(FTSPHRASE66);
             adaptor.addChild(root_0, FTSPHRASE66_tree);
 
@@ -2786,15 +2820,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupPhrase
+    // $ANTLR end "ftsFieldGroupPhrase"
 
     public static class ftsFieldGroupSynonym_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupSynonym
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:261:1: ftsFieldGroupSynonym : TILDA ftsFieldGroupTerm -> ftsFieldGroupTerm ;
+    // $ANTLR start "ftsFieldGroupSynonym"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:258:1: ftsFieldGroupSynonym : TILDA ftsFieldGroupTerm -> ftsFieldGroupTerm ;
     public final FTSParser.ftsFieldGroupSynonym_return ftsFieldGroupSynonym() throws RecognitionException {
         FTSParser.ftsFieldGroupSynonym_return retval = new FTSParser.ftsFieldGroupSynonym_return();
         retval.start = input.LT(1);
@@ -2809,13 +2843,13 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_TILDA=new RewriteRuleTokenStream(adaptor,"token TILDA");
         RewriteRuleSubtreeStream stream_ftsFieldGroupTerm=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupTerm");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:262:2: ( TILDA ftsFieldGroupTerm -> ftsFieldGroupTerm )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:262:4: TILDA ftsFieldGroupTerm
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:259:2: ( TILDA ftsFieldGroupTerm -> ftsFieldGroupTerm )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:259:4: TILDA ftsFieldGroupTerm
             {
-            TILDA67=(Token)match(input,TILDA,FOLLOW_TILDA_in_ftsFieldGroupSynonym943);  
+            TILDA67=(Token)match(input,TILDA,FOLLOW_TILDA_in_ftsFieldGroupSynonym942);  
             stream_TILDA.add(TILDA67);
 
-            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupSynonym945);
+            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupSynonym944);
             ftsFieldGroupTerm68=ftsFieldGroupTerm();
 
             state._fsp--;
@@ -2829,17 +2863,18 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 263:3: -> ftsFieldGroupTerm
+            // 260:3: -> ftsFieldGroupTerm
             {
                 adaptor.addChild(root_0, stream_ftsFieldGroupTerm.nextTree());
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -2857,15 +2892,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupSynonym
+    // $ANTLR end "ftsFieldGroupSynonym"
 
     public static class ftsFieldGroupProximity_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupProximity
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:266:1: ftsFieldGroupProximity : ftsFieldGroupTerm STAR ftsFieldGroupTerm -> ftsFieldGroupTerm ftsFieldGroupTerm ;
+    // $ANTLR start "ftsFieldGroupProximity"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:263:1: ftsFieldGroupProximity : ftsFieldGroupTerm STAR ftsFieldGroupTerm -> ftsFieldGroupTerm ftsFieldGroupTerm ;
     public final FTSParser.ftsFieldGroupProximity_return ftsFieldGroupProximity() throws RecognitionException {
         FTSParser.ftsFieldGroupProximity_return retval = new FTSParser.ftsFieldGroupProximity_return();
         retval.start = input.LT(1);
@@ -2882,19 +2917,19 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_STAR=new RewriteRuleTokenStream(adaptor,"token STAR");
         RewriteRuleSubtreeStream stream_ftsFieldGroupTerm=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupTerm");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:267:2: ( ftsFieldGroupTerm STAR ftsFieldGroupTerm -> ftsFieldGroupTerm ftsFieldGroupTerm )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:267:4: ftsFieldGroupTerm STAR ftsFieldGroupTerm
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:264:2: ( ftsFieldGroupTerm STAR ftsFieldGroupTerm -> ftsFieldGroupTerm ftsFieldGroupTerm )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:264:4: ftsFieldGroupTerm STAR ftsFieldGroupTerm
             {
-            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupProximity963);
+            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupProximity962);
             ftsFieldGroupTerm69=ftsFieldGroupTerm();
 
             state._fsp--;
 
             stream_ftsFieldGroupTerm.add(ftsFieldGroupTerm69.getTree());
-            STAR70=(Token)match(input,STAR,FOLLOW_STAR_in_ftsFieldGroupProximity965);  
+            STAR70=(Token)match(input,STAR,FOLLOW_STAR_in_ftsFieldGroupProximity964);  
             stream_STAR.add(STAR70);
 
-            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupProximity967);
+            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupProximity966);
             ftsFieldGroupTerm71=ftsFieldGroupTerm();
 
             state._fsp--;
@@ -2908,18 +2943,19 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 268:3: -> ftsFieldGroupTerm ftsFieldGroupTerm
+            // 265:3: -> ftsFieldGroupTerm ftsFieldGroupTerm
             {
                 adaptor.addChild(root_0, stream_ftsFieldGroupTerm.nextTree());
                 adaptor.addChild(root_0, stream_ftsFieldGroupTerm.nextTree());
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -2937,15 +2973,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupProximity
+    // $ANTLR end "ftsFieldGroupProximity"
 
     public static class ftsFieldGroupRange_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsFieldGroupRange
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:271:1: ftsFieldGroupRange : ftsFieldGroupTerm DOTDOT ftsFieldGroupTerm -> ftsFieldGroupTerm ftsFieldGroupTerm ;
+    // $ANTLR start "ftsFieldGroupRange"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:268:1: ftsFieldGroupRange : ftsFieldGroupTerm DOTDOT ftsFieldGroupTerm -> ftsFieldGroupTerm ftsFieldGroupTerm ;
     public final FTSParser.ftsFieldGroupRange_return ftsFieldGroupRange() throws RecognitionException {
         FTSParser.ftsFieldGroupRange_return retval = new FTSParser.ftsFieldGroupRange_return();
         retval.start = input.LT(1);
@@ -2962,19 +2998,19 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_DOTDOT=new RewriteRuleTokenStream(adaptor,"token DOTDOT");
         RewriteRuleSubtreeStream stream_ftsFieldGroupTerm=new RewriteRuleSubtreeStream(adaptor,"rule ftsFieldGroupTerm");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:271:19: ( ftsFieldGroupTerm DOTDOT ftsFieldGroupTerm -> ftsFieldGroupTerm ftsFieldGroupTerm )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:271:21: ftsFieldGroupTerm DOTDOT ftsFieldGroupTerm
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:268:19: ( ftsFieldGroupTerm DOTDOT ftsFieldGroupTerm -> ftsFieldGroupTerm ftsFieldGroupTerm )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:268:21: ftsFieldGroupTerm DOTDOT ftsFieldGroupTerm
             {
-            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupRange985);
+            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupRange984);
             ftsFieldGroupTerm72=ftsFieldGroupTerm();
 
             state._fsp--;
 
             stream_ftsFieldGroupTerm.add(ftsFieldGroupTerm72.getTree());
-            DOTDOT73=(Token)match(input,DOTDOT,FOLLOW_DOTDOT_in_ftsFieldGroupRange987);  
+            DOTDOT73=(Token)match(input,DOTDOT,FOLLOW_DOTDOT_in_ftsFieldGroupRange986);  
             stream_DOTDOT.add(DOTDOT73);
 
-            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupRange989);
+            pushFollow(FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupRange988);
             ftsFieldGroupTerm74=ftsFieldGroupTerm();
 
             state._fsp--;
@@ -2988,18 +3024,19 @@ public class FTSParser extends Parser {
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 272:3: -> ftsFieldGroupTerm ftsFieldGroupTerm
+            // 269:3: -> ftsFieldGroupTerm ftsFieldGroupTerm
             {
                 adaptor.addChild(root_0, stream_ftsFieldGroupTerm.nextTree());
                 adaptor.addChild(root_0, stream_ftsFieldGroupTerm.nextTree());
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -3017,15 +3054,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsFieldGroupRange
+    // $ANTLR end "ftsFieldGroupRange"
 
     public static class columnReference_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start columnReference
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:275:1: columnReference : (qualifier= identifier DOT )? name= identifier -> ^( COLUMN_REF $name ( $qualifier)? ) ;
+    // $ANTLR start "columnReference"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:272:1: columnReference : (qualifier= identifier DOT )? name= identifier -> ^( COLUMN_REF $name ( $qualifier)? ) ;
     public final FTSParser.columnReference_return columnReference() throws RecognitionException {
         FTSParser.columnReference_return retval = new FTSParser.columnReference_return();
         retval.start = input.LT(1);
@@ -3042,10 +3079,10 @@ public class FTSParser extends Parser {
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:276:2: ( (qualifier= identifier DOT )? name= identifier -> ^( COLUMN_REF $name ( $qualifier)? ) )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:276:4: (qualifier= identifier DOT )? name= identifier
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:273:2: ( (qualifier= identifier DOT )? name= identifier -> ^( COLUMN_REF $name ( $qualifier)? ) )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:273:4: (qualifier= identifier DOT )? name= identifier
             {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:276:4: (qualifier= identifier DOT )?
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:273:4: (qualifier= identifier DOT )?
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -3058,15 +3095,15 @@ public class FTSParser extends Parser {
             }
             switch (alt17) {
                 case 1 :
-                    // W:\\workspace-cmis\\ANTLR\\FTS.g:276:6: qualifier= identifier DOT
+                    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:273:6: qualifier= identifier DOT
                     {
-                    pushFollow(FOLLOW_identifier_in_columnReference1013);
+                    pushFollow(FOLLOW_identifier_in_columnReference1012);
                     qualifier=identifier();
 
                     state._fsp--;
 
                     stream_identifier.add(qualifier.getTree());
-                    DOT75=(Token)match(input,DOT,FOLLOW_DOT_in_columnReference1015);  
+                    DOT75=(Token)match(input,DOT,FOLLOW_DOT_in_columnReference1014);  
                     stream_DOT.add(DOT75);
 
 
@@ -3075,7 +3112,7 @@ public class FTSParser extends Parser {
 
             }
 
-            pushFollow(FOLLOW_identifier_in_columnReference1022);
+            pushFollow(FOLLOW_identifier_in_columnReference1021);
             name=identifier();
 
             state._fsp--;
@@ -3089,21 +3126,22 @@ public class FTSParser extends Parser {
             // rule labels: retval, name, qualifier
             // token list labels: 
             // rule list labels: 
+            // wildcard labels: 
             retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
-            RewriteRuleSubtreeStream stream_name=new RewriteRuleSubtreeStream(adaptor,"token name",name!=null?name.tree:null);
-            RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"token qualifier",qualifier!=null?qualifier.tree:null);
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_name=new RewriteRuleSubtreeStream(adaptor,"rule name",name!=null?name.tree:null);
+            RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier",qualifier!=null?qualifier.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 277:3: -> ^( COLUMN_REF $name ( $qualifier)? )
+            // 274:3: -> ^( COLUMN_REF $name ( $qualifier)? )
             {
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:277:6: ^( COLUMN_REF $name ( $qualifier)? )
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:274:6: ^( COLUMN_REF $name ( $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_name.nextTree());
-                // W:\\workspace-cmis\\ANTLR\\FTS.g:277:25: ( $qualifier)?
+                // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:274:25: ( $qualifier)?
                 if ( stream_qualifier.hasNext() ) {
                     adaptor.addChild(root_1, stream_qualifier.nextTree());
 
@@ -3115,7 +3153,7 @@ public class FTSParser extends Parser {
 
             }
 
-            retval.tree = root_0;retval.tree = root_0;
+            retval.tree = root_0;
             }
 
             retval.stop = input.LT(-1);
@@ -3133,15 +3171,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end columnReference
+    // $ANTLR end "columnReference"
 
     public static class identifier_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start identifier
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:280:1: identifier : ID ;
+    // $ANTLR start "identifier"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:277:1: identifier : ID ;
     public final FTSParser.identifier_return identifier() throws RecognitionException {
         FTSParser.identifier_return retval = new FTSParser.identifier_return();
         retval.start = input.LT(1);
@@ -3153,12 +3191,12 @@ public class FTSParser extends Parser {
         Object ID76_tree=null;
 
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:281:2: ( ID )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:281:4: ID
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:278:2: ( ID )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:278:4: ID
             {
             root_0 = (Object)adaptor.nil();
 
-            ID76=(Token)match(input,ID,FOLLOW_ID_in_identifier1050); 
+            ID76=(Token)match(input,ID,FOLLOW_ID_in_identifier1049); 
             ID76_tree = (Object)adaptor.create(ID76);
             adaptor.addChild(root_0, ID76_tree);
 
@@ -3180,15 +3218,15 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end identifier
+    // $ANTLR end "identifier"
 
     public static class ftsWord_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start ftsWord
-    // W:\\workspace-cmis\\ANTLR\\FTS.g:284:1: ftsWord : ( ID | FTSWORD );
+    // $ANTLR start "ftsWord"
+    // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:281:1: ftsWord : ( ID | FTSWORD );
     public final FTSParser.ftsWord_return ftsWord() throws RecognitionException {
         FTSParser.ftsWord_return retval = new FTSParser.ftsWord_return();
         retval.start = input.LT(1);
@@ -3200,8 +3238,8 @@ public class FTSParser extends Parser {
         Object set77_tree=null;
 
         try {
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:285:5: ( ID | FTSWORD )
-            // W:\\workspace-cmis\\ANTLR\\FTS.g:
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:282:5: ( ID | FTSWORD )
+            // W:\\alfresco\\HEAD\\root\\projects\\Repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g:
             {
             root_0 = (Object)adaptor.nil();
 
@@ -3234,7 +3272,7 @@ public class FTSParser extends Parser {
         }
         return retval;
     }
-    // $ANTLR end ftsWord
+    // $ANTLR end "ftsWord"
 
     // Delegated rules
 
@@ -3296,7 +3334,7 @@ public class FTSParser extends Parser {
             this.transition = DFA3_transition;
         }
         public String getDescription() {
-            return "137:1: ftsImplicitConjunctionOrDisjunction : ({...}? ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( CONJUNCTION ( ftsExplicitDisjunction )+ ) | ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( DISJUNCTION ( ftsExplicitDisjunction )+ ) );";
+            return "135:1: ftsImplicitConjunctionOrDisjunction : ({...}? ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( CONJUNCTION ( ftsExplicitDisjunction )+ ) | ftsExplicitDisjunction ( ftsExplicitDisjunction )* -> ^( DISJUNCTION ( ftsExplicitDisjunction )+ ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
@@ -3309,7 +3347,7 @@ public class FTSParser extends Parser {
                         int index3_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (defaultConjunction()) ) {s = 8;}
+                        if ( ((defaultConjunction())) ) {s = 8;}
 
                         else if ( (true) ) {s = 9;}
 
@@ -3324,7 +3362,7 @@ public class FTSParser extends Parser {
                         int index3_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (defaultConjunction()) ) {s = 8;}
+                        if ( ((defaultConjunction())) ) {s = 8;}
 
                         else if ( (true) ) {s = 9;}
 
@@ -3339,7 +3377,7 @@ public class FTSParser extends Parser {
                         int index3_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (defaultConjunction()) ) {s = 8;}
+                        if ( ((defaultConjunction())) ) {s = 8;}
 
                         else if ( (true) ) {s = 9;}
 
@@ -3354,7 +3392,7 @@ public class FTSParser extends Parser {
                         int index3_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (defaultConjunction()) ) {s = 8;}
+                        if ( ((defaultConjunction())) ) {s = 8;}
 
                         else if ( (true) ) {s = 9;}
 
@@ -3369,7 +3407,7 @@ public class FTSParser extends Parser {
                         int index3_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (defaultConjunction()) ) {s = 8;}
+                        if ( ((defaultConjunction())) ) {s = 8;}
 
                         else if ( (true) ) {s = 9;}
 
@@ -3384,7 +3422,7 @@ public class FTSParser extends Parser {
                         int index3_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (defaultConjunction()) ) {s = 8;}
+                        if ( ((defaultConjunction())) ) {s = 8;}
 
                         else if ( (true) ) {s = 9;}
 
@@ -3399,7 +3437,7 @@ public class FTSParser extends Parser {
                         int index3_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (defaultConjunction()) ) {s = 8;}
+                        if ( ((defaultConjunction())) ) {s = 8;}
 
                         else if ( (true) ) {s = 9;}
 
@@ -3473,7 +3511,7 @@ public class FTSParser extends Parser {
             this.transition = DFA7_transition;
         }
         public String getDescription() {
-            return "162:1: ftsTest : ( ftsTerm -> ^( TERM ftsTerm ) | ftsExactTerm -> ^( EXACT_TERM ftsExactTerm ) | ftsPhrase -> ^( PHRASE ftsPhrase ) | ftsSynonym -> ^( SYNONYM ftsSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | ftsFieldGroup | LPAREN ftsImplicitConjunctionOrDisjunction RPAREN -> ftsImplicitConjunctionOrDisjunction );";
+            return "159:1: ftsTest : ( ftsTerm -> ^( TERM ftsTerm ) | ftsExactTerm -> ^( EXACT_TERM ftsExactTerm ) | ftsPhrase -> ^( PHRASE ftsPhrase ) | ftsSynonym -> ^( SYNONYM ftsSynonym ) | ftsFieldGroupProximity -> ^( FG_PROXIMITY ftsFieldGroupProximity ) | ftsFieldGroupRange -> ^( FG_RANGE ftsFieldGroupRange ) | ftsFieldGroup | LPAREN ftsImplicitConjunctionOrDisjunction RPAREN -> ftsImplicitConjunctionOrDisjunction );";
         }
     }
  
@@ -3482,80 +3520,80 @@ public class FTSParser extends Parser {
     public static final BitSet FOLLOW_EOF_in_fts148 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction170 = new BitSet(new long[]{0x00000018E6000002L});
     public static final BitSet FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction173 = new BitSet(new long[]{0x00000018E6000002L});
-    public static final BitSet FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction192 = new BitSet(new long[]{0x00000018E6000000L});
+    public static final BitSet FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction192 = new BitSet(new long[]{0x00000018E6000002L});
     public static final BitSet FOLLOW_ftsExplicitDisjunction_in_ftsImplicitConjunctionOrDisjunction195 = new BitSet(new long[]{0x00000018E6000002L});
     public static final BitSet FOLLOW_ftsExplictConjunction_in_ftsExplicitDisjunction220 = new BitSet(new long[]{0x0000000000800002L});
-    public static final BitSet FOLLOW_OR_in_ftsExplicitDisjunction223 = new BitSet(new long[]{0x00000018E6800000L});
+    public static final BitSet FOLLOW_OR_in_ftsExplicitDisjunction223 = new BitSet(new long[]{0x00000018E6000000L});
     public static final BitSet FOLLOW_ftsExplictConjunction_in_ftsExplicitDisjunction225 = new BitSet(new long[]{0x0000000000800002L});
     public static final BitSet FOLLOW_ftsNot_in_ftsExplictConjunction250 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_AND_in_ftsExplictConjunction253 = new BitSet(new long[]{0x00000018E7000000L});
+    public static final BitSet FOLLOW_AND_in_ftsExplictConjunction253 = new BitSet(new long[]{0x00000018E6000000L});
     public static final BitSet FOLLOW_ftsNot_in_ftsExplictConjunction255 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_MINUS_in_ftsNot286 = new BitSet(new long[]{0x00000018E6000000L});
-    public static final BitSet FOLLOW_ftsTest_in_ftsNot288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsTest_in_ftsNot303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsTerm_in_ftsTest324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsExactTerm_in_ftsTest339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsPhrase_in_ftsTest359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsSynonym_in_ftsTest385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupProximity_in_ftsTest409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupRange_in_ftsTest436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroup_in_ftsTest460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_ftsTest469 = new BitSet(new long[]{0x00000018E6000000L});
-    public static final BitSet FOLLOW_ftsImplicitConjunctionOrDisjunction_in_ftsTest471 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_RPAREN_in_ftsTest473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_ftsTerm491 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_COLON_in_ftsTerm493 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_ftsWord_in_ftsTerm497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PLUS_in_ftsExactTerm518 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_ftsTerm_in_ftsExactTerm520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_ftsPhrase541 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_COLON_in_ftsPhrase543 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_FTSPHRASE_in_ftsPhrase547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TILDA_in_ftsSynonym568 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_ftsTerm_in_ftsSynonym570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_ftsFieldGroup589 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_COLON_in_ftsFieldGroup591 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_LPAREN_in_ftsFieldGroup593 = new BitSet(new long[]{0x00000018E6000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupImplicitConjunctionOrDisjunction_in_ftsFieldGroup595 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_RPAREN_in_ftsFieldGroup597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction623 = new BitSet(new long[]{0x00000018E6000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction626 = new BitSet(new long[]{0x00000018E6000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction644 = new BitSet(new long[]{0x00000018E6000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction647 = new BitSet(new long[]{0x00000018E6000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupExplictConjunction_in_ftsFieldGroupExplicitDisjunction672 = new BitSet(new long[]{0x0000000000800002L});
-    public static final BitSet FOLLOW_OR_in_ftsFieldGroupExplicitDisjunction675 = new BitSet(new long[]{0x00000018E6800000L});
-    public static final BitSet FOLLOW_ftsFieldGroupExplictConjunction_in_ftsFieldGroupExplicitDisjunction677 = new BitSet(new long[]{0x0000000000800002L});
-    public static final BitSet FOLLOW_ftsFieldGroupNot_in_ftsFieldGroupExplictConjunction702 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_AND_in_ftsFieldGroupExplictConjunction705 = new BitSet(new long[]{0x00000018E7000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupNot_in_ftsFieldGroupExplictConjunction707 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_MINUS_in_ftsFieldGroupNot734 = new BitSet(new long[]{0x00000018E6000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupTest_in_ftsFieldGroupNot736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupTest_in_ftsFieldGroupNot751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupTest770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupExactTerm_in_ftsFieldGroupTest785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupPhrase_in_ftsFieldGroupTest801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupSynonym_in_ftsFieldGroupTest816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupProximity_in_ftsFieldGroupTest833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupRange_in_ftsFieldGroupTest854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_ftsFieldGroupTest875 = new BitSet(new long[]{0x00000018EE000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupImplicitConjunctionOrDisjunction_in_ftsFieldGroupTest877 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_RPAREN_in_ftsFieldGroupTest879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsWord_in_ftsFieldGroupTerm897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PLUS_in_ftsFieldGroupExactTerm909 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupExactTerm911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FTSPHRASE_in_ftsFieldGroupPhrase931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TILDA_in_ftsFieldGroupSynonym943 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupSynonym945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupProximity963 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_STAR_in_ftsFieldGroupProximity965 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupProximity967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupRange985 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_DOTDOT_in_ftsFieldGroupRange987 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupRange989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_columnReference1013 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_DOT_in_columnReference1015 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_identifier_in_columnReference1022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_identifier1050 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_MINUS_in_ftsNot285 = new BitSet(new long[]{0x00000018E6000000L});
+    public static final BitSet FOLLOW_ftsTest_in_ftsNot287 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsTest_in_ftsNot302 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsTerm_in_ftsTest323 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsExactTerm_in_ftsTest338 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsPhrase_in_ftsTest358 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsSynonym_in_ftsTest384 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupProximity_in_ftsTest408 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupRange_in_ftsTest435 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroup_in_ftsTest459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_ftsTest468 = new BitSet(new long[]{0x00000018E6000000L});
+    public static final BitSet FOLLOW_ftsImplicitConjunctionOrDisjunction_in_ftsTest470 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_RPAREN_in_ftsTest472 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_ftsTerm490 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_COLON_in_ftsTerm492 = new BitSet(new long[]{0x0000001800000000L});
+    public static final BitSet FOLLOW_ftsWord_in_ftsTerm496 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PLUS_in_ftsExactTerm517 = new BitSet(new long[]{0x0000001800000000L});
+    public static final BitSet FOLLOW_ftsTerm_in_ftsExactTerm519 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_ftsPhrase540 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_COLON_in_ftsPhrase542 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_FTSPHRASE_in_ftsPhrase546 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TILDA_in_ftsSynonym567 = new BitSet(new long[]{0x0000001800000000L});
+    public static final BitSet FOLLOW_ftsTerm_in_ftsSynonym569 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_columnReference_in_ftsFieldGroup588 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_COLON_in_ftsFieldGroup590 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_LPAREN_in_ftsFieldGroup592 = new BitSet(new long[]{0x00000018E6000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupImplicitConjunctionOrDisjunction_in_ftsFieldGroup594 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_RPAREN_in_ftsFieldGroup596 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction622 = new BitSet(new long[]{0x00000018E6000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction625 = new BitSet(new long[]{0x00000018E6000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction643 = new BitSet(new long[]{0x00000018E6000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupExplicitDisjunction_in_ftsFieldGroupImplicitConjunctionOrDisjunction646 = new BitSet(new long[]{0x00000018E6000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupExplictConjunction_in_ftsFieldGroupExplicitDisjunction671 = new BitSet(new long[]{0x0000000000800002L});
+    public static final BitSet FOLLOW_OR_in_ftsFieldGroupExplicitDisjunction674 = new BitSet(new long[]{0x00000018E6000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupExplictConjunction_in_ftsFieldGroupExplicitDisjunction676 = new BitSet(new long[]{0x0000000000800002L});
+    public static final BitSet FOLLOW_ftsFieldGroupNot_in_ftsFieldGroupExplictConjunction701 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_AND_in_ftsFieldGroupExplictConjunction704 = new BitSet(new long[]{0x00000018E6000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupNot_in_ftsFieldGroupExplictConjunction706 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_MINUS_in_ftsFieldGroupNot733 = new BitSet(new long[]{0x00000018E6000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupTest_in_ftsFieldGroupNot735 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupTest_in_ftsFieldGroupNot750 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupTest769 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupExactTerm_in_ftsFieldGroupTest784 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupPhrase_in_ftsFieldGroupTest800 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupSynonym_in_ftsFieldGroupTest815 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupProximity_in_ftsFieldGroupTest832 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupRange_in_ftsFieldGroupTest853 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LPAREN_in_ftsFieldGroupTest874 = new BitSet(new long[]{0x00000018E6000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupImplicitConjunctionOrDisjunction_in_ftsFieldGroupTest876 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_RPAREN_in_ftsFieldGroupTest878 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsWord_in_ftsFieldGroupTerm896 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PLUS_in_ftsFieldGroupExactTerm908 = new BitSet(new long[]{0x0000001800000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupExactTerm910 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FTSPHRASE_in_ftsFieldGroupPhrase930 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TILDA_in_ftsFieldGroupSynonym942 = new BitSet(new long[]{0x0000001800000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupSynonym944 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupProximity962 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_STAR_in_ftsFieldGroupProximity964 = new BitSet(new long[]{0x0000001800000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupProximity966 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupRange984 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_DOTDOT_in_ftsFieldGroupRange986 = new BitSet(new long[]{0x0000001800000000L});
+    public static final BitSet FOLLOW_ftsFieldGroupTerm_in_ftsFieldGroupRange988 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_columnReference1012 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_DOT_in_columnReference1014 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_identifier_in_columnReference1021 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_identifier1049 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_set_in_ftsWord0 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/FTSTest.java b/source/java/org/alfresco/repo/search/impl/parsers/FTSTest.java
new file mode 100644
index 0000000000..66db030371
--- /dev/null
+++ b/source/java/org/alfresco/repo/search/impl/parsers/FTSTest.java
@@ -0,0 +1,66 @@
+package org.alfresco.repo.search.impl.parsers;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+import org.alfresco.repo.node.BaseNodeServiceTest;
+import org.antlr.gunit.GrammarInfo;
+import org.antlr.gunit.gUnitExecutor;
+import org.antlr.gunit.gUnitLexer;
+import org.antlr.gunit.gUnitParser;
+import org.antlr.runtime.ANTLRInputStream;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+
+public class FTSTest extends TestCase
+{
+    public FTSTest()
+    {
+        // TODO Auto-generated constructor stub
+    }
+
+    public FTSTest(String name)
+    {
+        super(name);
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+    }
+
+    public void testLexer() throws IOException, RecognitionException
+    {
+        ClassLoader cl = BaseNodeServiceTest.class.getClassLoader();
+        InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/search/impl/parsers/fts_test.gunit");
+
+        CharStream input = new ANTLRInputStream(modelStream);
+        
+        
+        gUnitExecutor executer = new gUnitExecutor(parse(input));
+        
+        System.out.print(executer.execTest());  // unit test result
+        
+        assertEquals("Failures ", 0, executer.failures.size()); 
+        assertEquals("Invalids ", 0, executer.invalids.size()); 
+    }
+
+    private GrammarInfo parse(CharStream input) throws RecognitionException
+    {
+        gUnitLexer lexer = new gUnitLexer(input);
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+
+        GrammarInfo grammarInfo = new GrammarInfo();
+        gUnitParser parser = new gUnitParser(tokens, grammarInfo);
+        parser.gUnitDef(); // parse gunit script and save elements to grammarInfo
+        return grammarInfo;
+    }
+
+    
+}
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
new file mode 100644
index 0000000000..59fd89c403
--- /dev/null
+++ b/source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit
@@ -0,0 +1,12 @@
+/** CMIS */
+
+gunit CMIS;
+
+@header{package org.alfresco.repo.search.impl.parsers;}
+
+/** Parser */
+
+query:
+"SELECT Name, ObjectId, asdf asdfasdf asdfasdf asdfasdfasdf FROM DOCUMENT" FAIL
+
+
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/fts_test.gunit b/source/java/org/alfresco/repo/search/impl/parsers/fts_test.gunit
new file mode 100644
index 0000000000..d466641068
--- /dev/null
+++ b/source/java/org/alfresco/repo/search/impl/parsers/fts_test.gunit
@@ -0,0 +1,16 @@
+/** FTS */
+
+gunit FTS;
+
+@header{package org.alfresco.repo.search.impl.parsers;}
+
+/** Parser */
+
+identifier:
+"banana"   OK
+
+/** Lexer */
+
+ID :
+"banana"   OK
+