diff --git a/tests/langparser1/langparser1.txt b/tests/langparser1/langparser1.txt
index add2b1cb..7a62c57e 100644
--- a/tests/langparser1/langparser1.txt
+++ b/tests/langparser1/langparser1.txt
@@ -1,27 +1,27 @@
-                                                Query: A -> Recoll query: Query((a OR a#10))
-                                              Query: A B -> Recoll query: Query(((a OR a#10) AND (b OR b#10)))
-                                          Query: A AND B -> Recoll query: Query(((a OR a#10) AND (b OR b#10)))
-                                           Query: A OR B -> Recoll query: Query(((a OR a#10) OR (b OR b#10)))
-                                     Query: A OR B AND C -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) AND (c OR c#10)))
-                                     Query: A AND B OR C -> Recoll query: Query(((a OR a#10) AND ((b OR b#10) OR (c OR c#10))))
-                           Query: (A AND B) OR (C AND D) -> Recoll query: Query((((a OR a#10) AND (b OR b#10)) OR ((c OR c#10) AND (d OR d#10))))
-                            Query: (A OR B) AND (C OR D) -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) AND ((c OR c#10) OR (d OR d#10))))
-                                           Query: -the B -> Recoll query: Query(((<alldocuments> AND_NOT (the OR the#10)) AND (b OR b#10)))
-                                             Query: A -B -> Recoll query: Query(((a OR a#10) AND (<alldocuments> AND_NOT (b OR b#10))))
+                                                Query: A -> Recoll query: Query(a)
+                                              Query: A B -> Recoll query: Query((a AND b))
+                                          Query: A AND B -> Recoll query: Query((a AND b))
+                                           Query: A OR B -> Recoll query: Query((a OR b))
+                                     Query: A OR B AND C -> Recoll query: Query(((a OR b) AND c))
+                                     Query: A AND B OR C -> Recoll query: Query((a AND (b OR c)))
+                           Query: (A AND B) OR (C AND D) -> Recoll query: Query(((a AND b) OR (c AND d)))
+                            Query: (A OR B) AND (C OR D) -> Recoll query: Query(((a OR b) AND (c OR d)))
+                                           Query: -the B -> Recoll query: Query(((<alldocuments> AND_NOT the) AND b))
+                                             Query: A -B -> Recoll query: Query((a AND (<alldocuments> AND_NOT b)))
                                   Query: mime:text/plain -> Recoll query: Query((<alldocuments> FILTER Ttext/plain))
                                          Query: size>10k -> Recoll query: Query((<alldocuments> FILTER VALUE_GE 2 000000010000))
                                   Query: date:3000-01-01 -> Recoll query: Query((<alldocuments> FILTER D30000101))
-            Query: mime:text/plain A OR B mime:text/html -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) FILTER (Ttext/html OR Ttext/plain)))
-           Query: mime:text/plain A AND B mime:text/html -> Recoll query: Query((((a OR a#10) AND (b OR b#10)) FILTER (Ttext/html OR Ttext/plain)))
-            Query: mime:text/plain mime:text/html (A B)  -> Recoll query: Query((((a OR a#10) AND (b OR b#10)) FILTER (Ttext/html OR Ttext/plain)))
-      Query: mime:text/plain OR mime:text/html OR (A B)  -> Recoll query: Query((((a OR a#10) AND (b OR b#10)) FILTER (Ttext/html OR Ttext/plain)))
-                                   Query: rclcat:media A -> Recoll query: Query(((a OR a#10) FILTER ((((((((((((((Tapplication/ogg OR Tapplication/x-flac) OR Taudio/mpeg) OR Taudio/x-karaoke) OR Timage/bmp) OR Timage/gif) OR Timage/jpeg) OR Timage/png) OR Timage/svg+xml) OR Timage/tiff) OR Timage/vnd.djvu) OR Timage/x-icon) OR Timage/x-xcf) OR Timage/x-xpmi) OR Tvideo/*)))
-                    Query: rclcat:media rclcat:message A -> Recoll query: Query(((a OR a#10) FILTER (((((((((((((((((((Tapplication/ogg OR Tapplication/x-flac) OR Taudio/mpeg) OR Taudio/x-karaoke) OR Timage/bmp) OR Timage/gif) OR Timage/jpeg) OR Timage/png) OR Timage/svg+xml) OR Timage/tiff) OR Timage/vnd.djvu) OR Timage/x-icon) OR Timage/x-xcf) OR Timage/x-xpmi) OR Tmessage/rfc822) OR Ttext/x-gaim-log) OR Ttext/x-mail) OR Ttext/x-purple-html-log) OR Ttext/x-purple-log) OR Tvideo/*)))
-                                       Query: A size>10k -> Recoll query: Query(((a OR a#10) FILTER VALUE_GE 2 000000010000))
-                                       Query: size>10k A -> Recoll query: Query(((a OR a#10) FILTER VALUE_GE 2 000000010000))
-                                Query: date:3000-01-01 A -> Recoll query: Query(((a OR a#10) FILTER D30000101))
-                           Query: A OR B date:3000-01-01 -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) FILTER D30000101))
-                       Query: A OR B AND date:3000-01-01 -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) FILTER D30000101))
-                                        Query: title:A B -> Recoll query: Query(((Sa OR Sa#10) AND (b OR b#10)))
-                                       Query: title:A -B -> Recoll query: Query(((Sa OR Sa#10) AND (<alldocuments> AND_NOT (b OR b#10))))
-                                       Query: A -title:B -> Recoll query: Query(((a OR a#10) AND (<alldocuments> AND_NOT (Sb OR Sb#10))))
+            Query: mime:text/plain A OR B mime:text/html -> Recoll query: Query(((a OR b) FILTER (Ttext/html OR Ttext/plain)))
+           Query: mime:text/plain A AND B mime:text/html -> Recoll query: Query(((a AND b) FILTER (Ttext/html OR Ttext/plain)))
+            Query: mime:text/plain mime:text/html (A B)  -> Recoll query: Query(((a AND b) FILTER (Ttext/html OR Ttext/plain)))
+      Query: mime:text/plain OR mime:text/html OR (A B)  -> Recoll query: Query(((a AND b) FILTER (Ttext/html OR Ttext/plain)))
+                                   Query: rclcat:media A -> Recoll query: Query((a FILTER ((((((((((((((Tapplication/ogg OR Tapplication/x-flac) OR Taudio/mpeg) OR Taudio/x-karaoke) OR Timage/bmp) OR Timage/gif) OR Timage/jpeg) OR Timage/png) OR Timage/svg+xml) OR Timage/tiff) OR Timage/vnd.djvu) OR Timage/x-icon) OR Timage/x-xcf) OR Timage/x-xpmi) OR Tvideo/*)))
+                    Query: rclcat:media rclcat:message A -> Recoll query: Query((a FILTER (((((((((((((((((((Tapplication/ogg OR Tapplication/x-flac) OR Taudio/mpeg) OR Taudio/x-karaoke) OR Timage/bmp) OR Timage/gif) OR Timage/jpeg) OR Timage/png) OR Timage/svg+xml) OR Timage/tiff) OR Timage/vnd.djvu) OR Timage/x-icon) OR Timage/x-xcf) OR Timage/x-xpmi) OR Tmessage/rfc822) OR Ttext/x-gaim-log) OR Ttext/x-mail) OR Ttext/x-purple-html-log) OR Ttext/x-purple-log) OR Tvideo/*)))
+                                       Query: A size>10k -> Recoll query: Query((a FILTER VALUE_GE 2 000000010000))
+                                       Query: size>10k A -> Recoll query: Query((a FILTER VALUE_GE 2 000000010000))
+                                Query: date:3000-01-01 A -> Recoll query: Query((a FILTER D30000101))
+                           Query: A OR B date:3000-01-01 -> Recoll query: Query(((a OR b) FILTER D30000101))
+                       Query: A OR B AND date:3000-01-01 -> Recoll query: Query(((a OR b) FILTER D30000101))
+                                        Query: title:A B -> Recoll query: Query((Sa AND b))
+                                       Query: title:A -B -> Recoll query: Query((Sa AND (<alldocuments> AND_NOT b)))
+                                       Query: A -title:B -> Recoll query: Query((a AND (<alldocuments> AND_NOT Sb)))
diff --git a/tests/pythonapi/pythonapi.txt b/tests/pythonapi/pythonapi.txt
index ca42d4fb..0c454d99 100644
--- a/tests/pythonapi/pythonapi.txt
+++ b/tests/pythonapi/pythonapi.txt
@@ -1,5 +1,5 @@
 python doc.py
-Xapian query: [Query((TSTFLDtestfieldvalue1 OR TSTFLDtestfieldvalue1#10))]
+Xapian query: [Query(TSTFLDtestfieldvalue1)]
 Result count: 1 1
 doc.title: [HTML fields test file: été à noël]
 doc.testfield: [testfieldvalue1]
@@ -56,7 +56,7 @@ Result count: 1 1
 Text length: 3457
 bfbb63f7a245c31767585b45014dbd07
 python simple.py
-Xapian query: [Query((huniique OR huniique#10))]
+Xapian query: [Query(huniique)]
 Result count: 2 2
 for i in range(nres):
 Home.ics
@@ -68,7 +68,7 @@ unique.txt
 
 Catched bad mode. (ok)
 python url.py
-Xapian query: [Query(((latin1name_uniquexxx OR latin1name_uniquexxx#10) AND XPiso8859name))]
+Xapian query: [Query((latin1name_uniquexxx AND XPiso8859name))]
 Result count: 1 1
 iso8859-1_????????.txt
 Contents: [LATIN1NAME_UNIQUEXXX