Revert "Bratseth/weakand by default take 2"

15 files changed, 107 insertions, 113 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
index 7a7ae173766..ff23c16e7ba 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
@@ -68,7 +68,7 @@ public class ProtobufSerializationTest {
         hit.setGlobalId(new GlobalId(IdString.createIdString("id:ns:type::id")).getRawId());
         var bytes = ProtobufSerialization.serializeDocsumRequest(builder, Collections.singletonList(hit));
 
-        assertEquals(46, bytes.length);
+        assertEquals(41, bytes.length);
     }
 
     private String contentsOf(ByteString property) {
diff --git a/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java b/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
index a0374570b69..b1354106f19 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
@@ -167,7 +167,7 @@ public class SearchHandlerTest {
         HttpSearchResponse s = new HttpSearchResponse(200, r, q, new XmlRenderer());
         assertEquals("text/xml", s.getContentType());
         assertNull(s.getCoverage());
-        assertEquals("query 'WEAKAND(100) dummy'", s.getParsedQuery());
+        assertEquals("query 'dummy'", s.getParsedQuery());
         assertEquals(500, s.getTiming().getTimeout());
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
index c64d5df64f9..a89ef8c1b2b 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
@@ -57,20 +57,20 @@ public class QueryProfileIntegrationTestCase {
         // Tests a profile setting hits and offset
         request = HttpRequest.createTestRequest("search?queryProfile=hitsoffset", Method.GET);
         response = (HttpSearchResponse)searchHandler.handle(request); // Cast to access content directly
-        assertEquals(20, response.getQuery().getHits());
-        assertEquals(80, response.getQuery().getOffset());
+        assertEquals(20,response.getQuery().getHits());
+        assertEquals(80,response.getQuery().getOffset());
 
         // Tests a non-resolved profile request
         request = HttpRequest.createTestRequest("search?queryProfile=none", Method.GET);
         response = (HttpSearchResponse)searchHandler.handle(request); // Cast to access content directly
-        assertNotNull("Got an error", response.getResult().hits().getError());
-        assertEquals("Could not resolve query profile 'none'", response.getResult().hits().getError().getDetailedMessage());
+        assertNotNull("Got an error",response.getResult().hits().getError());
+        assertEquals("Could not resolve query profile 'none'",response.getResult().hits().getError().getDetailedMessage());
 
         // Tests that properties in objects owned by query is handled correctly
         request = HttpRequest.createTestRequest("search?query=word&queryProfile=test", Method.GET);
         response = (HttpSearchResponse)searchHandler.handle(request); // Cast to access content directly
-        assertEquals("index" ,response.getQuery().getModel().getDefaultIndex());
-        assertEquals("WEAKAND(100) index:word", response.getQuery().getModel().getQueryTree().toString());
+        assertEquals("index",response.getQuery().getModel().getDefaultIndex());
+        assertEquals("index:word",response.getQuery().getModel().getQueryTree().toString());
         configurer.shutdown();
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java
index 7a92aa8081b..3ce91719874 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java
@@ -35,7 +35,7 @@ public class QueryFromProfileTestCase {
 
         Query query = new Query(HttpRequest.createTestRequest("?model=querybest", Method.GET), cRegistry.getComponent("topLevel"));
         assertEquals("best", query.properties().get("model.queryString"));
-        assertEquals("WEAKAND(100) best", query.getModel().getQueryTree().toString());
+        assertEquals("best", query.getModel().getQueryTree().toString());
     }
 
     @Test
@@ -58,7 +58,7 @@ public class QueryFromProfileTestCase {
 
         Query query = new Query(HttpRequest.createTestRequest("?query=overrides&model=querybest", Method.GET), cRegistry.getComponent("root"));
         assertEquals("overrides", query.properties().get("model.queryString"));
-        assertEquals("WEAKAND(100) overrides", query.getModel().getQueryTree().toString());
+        assertEquals("overrides", query.getModel().getQueryTree().toString());
     }
 
     @Test
@@ -81,7 +81,7 @@ public class QueryFromProfileTestCase {
 
         Query query = new Query(HttpRequest.createTestRequest("?query=overrides&model=querybest", Method.GET), cRegistry.getComponent("root"));
         assertEquals("overrides", query.properties().get("model.queryString"));
-        assertEquals("WEAKAND(100) overrides", query.getModel().getQueryTree().toString());
+        assertEquals("overrides", query.getModel().getQueryTree().toString());
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
index 72b77377bf2..7e9ed674475 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
@@ -3,7 +3,6 @@ package com.yahoo.search.query.rewrite;
 
 import static org.junit.Assert.*;
 
-import com.yahoo.prelude.query.WeakAndItem;
 import org.junit.Test;
 
 import com.yahoo.prelude.query.AndItem;
@@ -38,7 +37,7 @@ public class RewriterFeaturesTestCase {
         query.getModel().setExecution(placeholder);
         Item parsed = RewriterFeatures.convertStringToQTree(query, "a b c "
                 + ASCII_ELLIPSIS);
-        assertSame(WeakAndItem.class, parsed.getClass());
+        assertSame(AndItem.class, parsed.getClass());
         assertEquals(4, ((CompositeItem) parsed).getItemCount());
         assertEquals(ASCII_ELLIPSIS, ((CompositeItem) parsed).getItem(3).toString());
     }
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
index d9a3603bdaf..49d1497b2d3 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
@@ -97,7 +97,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteSingleWordFilter() {
-        utils.assertRewrittenQuery("?query=ca&type=all&" +
+        utils.assertRewrittenQuery("?query=ca&" +
                                    "filter=citystate:santa clara ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'RANK (OR california ca) |citystate:santa |clara |ca'");
@@ -108,7 +108,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testPartialPhraseNoMaxRewriteSingleWordFilter() {
-        utils.assertRewrittenQuery("?query=ca&type=all&" +
+        utils.assertRewrittenQuery("?query=ca&" +
                                    "filter=citystate:santa clara ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
                                    "query 'RANK (OR california ca) |citystate:santa |clara |ca'");
@@ -119,7 +119,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteMultiWordFilter() {
-        utils.assertRewrittenQuery("?query=travel agency&type=all&" +
+        utils.assertRewrittenQuery("?query=travel agency&" +
                                    "filter=citystate:santa clara ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'RANK (OR ta (AND travel agency)) |citystate:santa |clara |ca'");
@@ -131,7 +131,7 @@ public class GenericExpansionRewriterTestCase {
     @Test
     public void testPartialPhraseNoMaxRewriteMultiWordFilter() {
         utils.assertRewrittenQuery("?query=modern new york city travel phone number&" +
-                                   "filter=citystate:santa clara ca&type=all&" +
+                                   "filter=citystate:santa clara ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
                                    "query 'RANK (AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 " +
                                    "rewrite4 rewrite5 (AND new york city travel)) (OR pn (AND phone number))) " +
@@ -143,7 +143,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteSingleWord() {
-        utils.assertRewrittenQuery("?query=ca&type=all&" +
+        utils.assertRewrittenQuery("?query=ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'OR california ca'");
     }
@@ -153,7 +153,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testPartialPhraseNoMaxRewriteSingleWord() {
-        utils.assertRewrittenQuery("?query=ca&type=all&" +
+        utils.assertRewrittenQuery("?query=ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
                                    "query 'OR california ca'");
     }
@@ -163,7 +163,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteMultiWord() {
-        utils.assertRewrittenQuery("?query=travel agency&type=all&" +
+        utils.assertRewrittenQuery("?query=travel agency&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'OR ta (AND travel agency)'");
     }
@@ -173,7 +173,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteMultiWordNoMatch() {
-        utils.assertRewrittenQuery("?query=nyc travel agency&type=all&" +
+        utils.assertRewrittenQuery("?query=nyc travel agency&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'AND nyc travel agency'");
     }
@@ -183,7 +183,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testPartialPhraseNoMaxRewriteMultiWord() {
-        utils.assertRewrittenQuery("?query=modern new york city travel phone number&type=all&" +
+        utils.assertRewrittenQuery("?query=modern new york city travel phone number&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
                                    "query 'AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 rewrite4 rewrite5 "+
                                    "(AND new york city travel)) (OR pn (AND phone number))'");
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
index 6c9f9c248ea..b0d1f36fab1 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
@@ -47,7 +47,7 @@ public class MisspellRewriterTestCase {
         utils.assertRewrittenQuery("?query=willl+smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith sugg)'",
+                                   "query 'OR (AND willl smith) (AND will smith sugg)'",
                                    intentModel);
     }
 
@@ -67,7 +67,7 @@ public class MisspellRewriterTestCase {
 
         utils.assertRewrittenQuery("?query=willl+smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true",
-                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith rw1)'",
+                                   "query 'OR (AND willl smith) (AND will smith rw1)'",
                                    intentModel);
     }
 
@@ -87,7 +87,7 @@ public class MisspellRewriterTestCase {
 
         utils.assertRewrittenQuery("?query=willl+smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith sugg1)'",
+                                   "query 'OR (AND willl smith) (AND will smith sugg1)'",
                                    intentModel);
     }
 
@@ -104,7 +104,7 @@ public class MisspellRewriterTestCase {
                                                              false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith",
-                                   "query 'WEAKAND(100) willl smith'",
+                                   "query 'AND willl smith'",
                                    intentModel);
     }
 
@@ -123,7 +123,7 @@ public class MisspellRewriterTestCase {
         utils.assertRewrittenQuery("?query=will+smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'WEAKAND(100) will smith'",
+                                   "query 'AND will smith'",
                                    intentModel);
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
index c99ddcd6c62..e645c560f9d 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
@@ -45,7 +45,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsEquivAndOriginalAsUnit() {
-        utils.assertRewrittenQuery("?query=will smith&type=all&" +
+        utils.assertRewrittenQuery("?query=will smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
                                    "query 'OR \"will smith\" (AND will smith movies) " +
@@ -60,7 +60,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsEquiv() {
-        utils.assertRewrittenQuery("?query=will smith&type=all&" +
+        utils.assertRewrittenQuery("?query=will smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&",
                                    "query 'OR (AND will smith) (AND will smith movies) " +
                                    "(AND will smith news) (AND will smith imdb) " +
@@ -85,7 +85,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testSingleWordForRewritesAsEquivAndOriginalAsUnit() {
-        utils.assertRewrittenQuery("?query=obama&type=all&" +
+        utils.assertRewrittenQuery("?query=obama&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
                                    "query 'OR obama (AND obama \"nobel peace prize\") " +
@@ -102,7 +102,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsUnitEquivAndOriginalAsUnitEquiv() {
-        utils.assertRewrittenQuery("?query=will smith&type=all&" +
+        utils.assertRewrittenQuery("?query=will smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
                                    "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
@@ -119,7 +119,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testSingleWordForRewritesAsUnitEquivAndOriginalAsUnitEquiv() {
-        utils.assertRewrittenQuery("?query=obama&type=all&" +
+        utils.assertRewrittenQuery("?query=obama&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
                                    "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
@@ -133,7 +133,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testBoostingQueryForRewritesAsEquivAndOriginalAsUnit() {
-        utils.assertRewrittenQuery("?query=angelina jolie&type=all&" +
+        utils.assertRewrittenQuery("?query=angelina jolie&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
                                    "query '\"angelina jolie\"'");
@@ -145,7 +145,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testFSANoMatchForRewritesAsEquivAndOriginalAsUnit() {
-        utils.assertRewrittenQuery("?query=tom cruise&type=all&" +
+        utils.assertRewrittenQuery("?query=tom cruise&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
                                    "query 'AND tom cruise'");
@@ -156,7 +156,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsUnitEquiv() {
-        utils.assertRewrittenQuery("?query=will smith&type=all&" +
+        utils.assertRewrittenQuery("?query=will smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
                                    "=true",
                                    "query 'OR (AND will smith) \"will smith movies\" " +
@@ -171,7 +171,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsUnitEquivAndMaxRewrites() {
-        utils.assertRewrittenQuery("?query=will smith&type=all&" +
+        utils.assertRewrittenQuery("?query=will smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
                                    "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.MAX_REWRITES + "=2",
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
index 8906dbfa386..a528c032e30 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
@@ -79,7 +79,7 @@ public class QueryRewriteSearcherTestCase {
         Execution execution = QueryRewriteSearcherTestUtils.createExecutionObj(searchers);
         QueryRewriteSearcherTestUtils utilsWithFakePath = new QueryRewriteSearcherTestUtils(execution);
 
-        utilsWithFakePath.assertRewrittenQuery("?query=will smith&type=all&" +
+        utilsWithFakePath.assertRewrittenQuery("?query=will smith&" +
                                                NAME_REWRITER_NAME + "." +
                                                RewriterConstants.REWRITES_AS_UNIT_EQUIV + "=true",
                                                "query 'AND will smith'");
@@ -91,7 +91,7 @@ public class QueryRewriteSearcherTestCase {
      */
     @Test
     public void testExceptionInRewriter() {
-        utils.assertRewrittenQuery("?query=will smith&type=all&" +
+        utils.assertRewrittenQuery("?query=will smith&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
@@ -117,7 +117,7 @@ public class QueryRewriteSearcherTestCase {
                                   utils.createInterpretation("will smith", 1.0,
                                                              false, true));
 
-        utils.assertRewrittenQuery("?query=willl+smith&type=all&" +
+        utils.assertRewrittenQuery("?query=willl+smith&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
index 96626738c35..bf204cf3d6b 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
@@ -77,7 +77,7 @@ public class SearchChainDispatcherSearcherTestCase {
                                   utils.createInterpretation("will smith", 1.0,
                                                              false, true));
 
-        utils.assertRewrittenQuery("?query=willl+smith&type=all&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
+        utils.assertRewrittenQuery("?query=willl+smith&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
@@ -98,7 +98,7 @@ public class SearchChainDispatcherSearcherTestCase {
      */
     @Test
     public void testInvalidMarketChain() {
-        utils.assertRewrittenQuery("?query=will smith&type=all&QRWChain=abc&" +
+        utils.assertRewrittenQuery("?query=will smith&QRWChain=abc&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
@@ -112,7 +112,7 @@ public class SearchChainDispatcherSearcherTestCase {
      */
     @Test
     public void testEmptyMarketChain() {
-        utils.assertRewrittenQuery("?query=will smith&type=all&QRWChain=&" +
+        utils.assertRewrittenQuery("?query=will smith&QRWChain=&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
@@ -161,7 +161,7 @@ public class SearchChainDispatcherSearcherTestCase {
                                   utils.createInterpretation("will smith", 1.0,
                                                              false, true));
 
-        utils.assertRewrittenQuery("?query=willl+smith&type=all&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
+        utils.assertRewrittenQuery("?query=willl+smith&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
index 460ae1f641c..46e5682a058 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
@@ -19,7 +19,6 @@ import com.yahoo.prelude.hitfield.JSONString;
 import com.yahoo.prelude.hitfield.XMLString;
 import com.yahoo.prelude.query.AndItem;
 import com.yahoo.prelude.query.Item;
-import com.yahoo.prelude.query.WeakAndItem;
 import com.yahoo.prelude.query.WordItem;
 import com.yahoo.prelude.querytransform.CJKSearcher;
 import com.yahoo.search.Query;
@@ -107,22 +106,22 @@ public class NGramSearcherTestCase {
         {
             Query q = new Query("?query=abc&restrict=song");
             createMixedSetupExecution().search(q);
-            assertEquals("WEAKAND(100) abc", q.getModel().getQueryTree().toString());
+            assertEquals("abc", q.getModel().getQueryTree().toString());
         }
         {
             Query q = new Query("?query=abc&restrict=music");
             createMixedSetupExecution().search(q);
-            assertEquals("WEAKAND(100) (AND a b c)", q.getModel().getQueryTree().toString());
+            assertEquals("AND a b c", q.getModel().getQueryTree().toString());
         }
         {
             Query q = new Query("?query=abc&search=song");
             createMixedSetupExecution().search(q);
-            assertEquals("WEAKAND(100) abc", q.getModel().getQueryTree().toString());
+            assertEquals("abc", q.getModel().getQueryTree().toString());
         }
         {
             Query q = new Query("?query=abc&search=music");
             createMixedSetupExecution().search(q);
-            assertEquals("WEAKAND(100) (AND a b c)", q.getModel().getQueryTree().toString());
+            assertEquals("AND a b c", q.getModel().getQueryTree().toString());
         }
     }
 
@@ -131,22 +130,22 @@ public class NGramSearcherTestCase {
         {
             Query q = new Query("?query=abc&search=songOnly");
             createMixedSetupExecution().search(q);
-            assertEquals("WEAKAND(100) abc", q.getModel().getQueryTree().toString());
+            assertEquals("abc", q.getModel().getQueryTree().toString());
         }
         {
             Query q = new Query("?query=abc&search=musicOnly");
             createMixedSetupExecution().search(q);
-            assertEquals("WEAKAND(100) (AND a b c)", q.getModel().getQueryTree().toString());
+            assertEquals("AND a b c", q.getModel().getQueryTree().toString());
         }
         {
             Query q = new Query("?query=abc&search=musicAndSong&restrict=music");
             createMixedSetupExecution().search(q);
-            assertEquals("WEAKAND(100) (AND a b c)", q.getModel().getQueryTree().toString());
+            assertEquals("AND a b c", q.getModel().getQueryTree().toString());
         }
         {
             Query q = new Query("?query=abc&search=musicAndSong&restrict=song");
             createMixedSetupExecution().search(q);
-            assertEquals("WEAKAND(100) abc", q.getModel().getQueryTree().toString());
+            assertEquals("abc", q.getModel().getQueryTree().toString());
         }
     }
 
@@ -154,42 +153,42 @@ public class NGramSearcherTestCase {
     public void testNGramRewritingMixedQuery() {
         Query q = new Query("?query=foo+gram3:engul+test:bar");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) foo (AND gram3:eng gram3:ngu gram3:gul) test:bar", q.getModel().getQueryTree().toString());
+        assertEquals("AND foo (AND gram3:eng gram3:ngu gram3:gul) test:bar", q.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testNGramRewritingNGramOnly() {
         Query q = new Query("?query=gram3:engul");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) (AND gram3:eng gram3:ngu gram3:gul)", q.getModel().getQueryTree().toString());
+        assertEquals("AND gram3:eng gram3:ngu gram3:gul", q.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testNGramRewriting2NGramsOnly() {
         Query q = new Query("?query=gram3:engul+gram2:123");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) (AND gram3:eng gram3:ngu gram3:gul) (AND gram2:12 gram2:23)", q.getModel().getQueryTree().toString());
+        assertEquals("AND (AND gram3:eng gram3:ngu gram3:gul) (AND gram2:12 gram2:23)", q.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testNGramRewritingShortOnly() {
         Query q = new Query("?query=gram3:en");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) gram3:en", q.getModel().getQueryTree().toString());
+        assertEquals("gram3:en", q.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testNGramRewritingShortInMixes() {
         Query q = new Query("?query=test:a+gram3:en");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) test:a gram3:en", q.getModel().getQueryTree().toString());
+        assertEquals("AND test:a gram3:en", q.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testNGramRewritingPhrase() {
         Query q = new Query("?query=gram3:%22engul+a+holi%22");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) gram3:\"eng ngu gul a hol oli\"", q.getModel().getQueryTree().toString());
+        assertEquals("gram3:\"eng ngu gul a hol oli\"", q.getModel().getQueryTree().toString());
     }
 
     /**
@@ -200,14 +199,14 @@ public class NGramSearcherTestCase {
     public void testNGramRewritingPhraseSingleTerm() {
         Query q = new Query("?query=gram3:%22engul%22");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) (AND gram3:eng gram3:ngu gram3:gul)", q.getModel().getQueryTree().toString());
+        assertEquals("AND gram3:eng gram3:ngu gram3:gul", q.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testNGramRewritingAdditionalTermInfo() {
         Query q = new Query("?query=gram3:engul!50+foo+gram2:123!150");
         createExecution().search(q);
-        WeakAndItem root = (WeakAndItem)q.getModel().getQueryTree().getRoot();
+        AndItem root = (AndItem)q.getModel().getQueryTree().getRoot();
         AndItem gram3And = (AndItem)root.getItem(0);
         AndItem gram2And = (AndItem)root.getItem(2);
 
@@ -230,14 +229,14 @@ public class NGramSearcherTestCase {
     public void testNGramRewritingExplicitDefault() {
         Query q = new Query("?query=default:engul");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) (AND default:eng default:ngu default:gul)" ,q.getModel().getQueryTree().toString());
+        assertEquals("AND default:eng default:ngu default:gul" ,q.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testNGramRewritingImplicitDefault() {
         Query q = new Query("?query=engul");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) (AND eng ngu gul)", q.getModel().getQueryTree().toString());
+        assertEquals("AND eng ngu gul", q.getModel().getQueryTree().toString());
     }
 
     @Test
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index 5c5d9006d1a..bddba51f17a 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -26,7 +26,6 @@ import com.yahoo.prelude.query.IntItem;
 import com.yahoo.prelude.query.Item;
 import com.yahoo.prelude.query.OrItem;
 import com.yahoo.prelude.query.RankItem;
-import com.yahoo.prelude.query.WeakAndItem;
 import com.yahoo.prelude.query.WordItem;
 import com.yahoo.processing.request.CompoundName;
 import com.yahoo.search.Query;
@@ -441,7 +440,7 @@ public class QueryTestCase {
     @Test
     public void testUtf8Decoding() {
         Query q = new Query("/?query=beyonc%C3%A9");
-        assertEquals("WEAKAND(100) beyonc\u00e9", q.getModel().getQueryTree().toString());
+        assertEquals("beyonc\u00e9", q.getModel().getQueryTree().toString());
     }
 
     @Test
@@ -461,7 +460,7 @@ public class QueryTestCase {
     public void testDefaultIndex() {
         Query q = new Query("?query=hi%20hello%20keyword:kanoo%20" +
                             "default:munkz%20%22phrases+too%22&default-index=def");
-        assertEquals("WEAKAND(100) def:hi def:hello keyword:kanoo default:munkz def:\"phrases too\"",
+        assertEquals("AND def:hi def:hello keyword:kanoo default:munkz def:\"phrases too\"",
                      q.getModel().getQueryTree().toString());
     }
 
@@ -475,9 +474,9 @@ public class QueryTestCase {
     @Test
     public void testSimpleQueryParsing() {
         Query q = new Query("/search?query=foobar&offset=10&hits=20");
-        assertEquals("WEAKAND(100) foobar", q.getModel().getQueryTree().toString());
-        assertEquals(10, q.getOffset());
-        assertEquals(20, q.getHits());
+        assertEquals("foobar", q.getModel().getQueryTree().toString());
+        assertEquals(10,q.getOffset());
+        assertEquals(20,q.getHits());
     }
 
     /** "input.*" is an alias for "ranking.feature.*", but just "input" is not */
@@ -551,7 +550,7 @@ public class QueryTestCase {
 
     @Test
     public void testTracing() {
-        Query q = new Query("?query=foo&type=all&traceLevel=2");
+        Query q = new Query("?query=foo&traceLevel=2");
         assertEquals(2, q.getTraceLevel());
         q.trace(true, 1, "trace1");
         q.trace(false,2, "trace2");
@@ -969,12 +968,12 @@ public class QueryTestCase {
     @Test
     public void testImplicitPhraseIsDefault() {
         Query query = new Query(httpEncode("?query=it's fine"));
-        assertEquals("WEAKAND(100) (SAND it s) fine", query.getModel().getQueryTree().toString());
+        assertEquals("AND (SAND it s) fine", query.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testImplicitPhrase() {
-        Query query = new Query(httpEncode("?query=myfield:it's myfield:a.b myfield:c&type=all"));
+        Query query = new Query(httpEncode("?query=myfield:it's myfield:a.b myfield:c"));
 
         SearchDefinition test = new SearchDefinition("test");
         Index myField = new Index("myfield");
@@ -999,9 +998,9 @@ public class QueryTestCase {
         IndexModel indexModel = new IndexModel(test);
         query.getModel().setExecution(new Execution(Execution.Context.createContextStub(new IndexFacts(indexModel))));
 
-        assertEquals("WEAKAND(100) (SAND myfield:it myfield:s) (AND myfield:a myfield:b) myfield:c", query.getModel().getQueryTree().toString());
+        assertEquals("AND (SAND myfield:it myfield:s) myfield:a myfield:b myfield:c", query.getModel().getQueryTree().toString());
         // 'it' and 's' should have connectivity 1
-        WeakAndItem root = (WeakAndItem)query.getModel().getQueryTree().getRoot();
+        AndItem root = (AndItem)query.getModel().getQueryTree().getRoot();
         AndSegmentItem sand = (AndSegmentItem)root.getItem(0);
         WordItem it = (WordItem)sand.getItem(0);
         assertEquals("it", it.getWord());
@@ -1022,12 +1021,11 @@ public class QueryTestCase {
         {
             Query query = new Query(httpEncode("?query=myfield:b.c.d"));
             query.getModel().setExecution(new Execution(Execution.Context.createContextStub(new IndexFacts(indexModel))));
-            assertEquals("WEAKAND(100) (AND myfield:b myfield:c myfield:d)", query.getModel().getQueryTree().toString());
-            WeakAndItem root = (WeakAndItem) query.getModel().getQueryTree().getRoot();
-            AndItem and = (AndItem)root.getItem(0);
-            WordItem b = (WordItem) and.getItem(0);
-            WordItem c = (WordItem) and.getItem(1);
-            WordItem d = (WordItem) and.getItem(2);
+            assertEquals("AND myfield:b myfield:c myfield:d", query.getModel().getQueryTree().toString());
+            AndItem root = (AndItem) query.getModel().getQueryTree().getRoot();
+            WordItem b = (WordItem) root.getItem(0);
+            WordItem c = (WordItem) root.getItem(1);
+            WordItem d = (WordItem) root.getItem(2);
             assertEquals(c, b.getConnectedItem());
             assertEquals(1.0, b.getConnectivity(), 0.00000001);
             assertEquals(d, c.getConnectedItem());
@@ -1037,21 +1035,19 @@ public class QueryTestCase {
         {
             Query query = new Query(httpEncode("?query=myfield:a myfield:b.c.d myfield:e"));
             query.getModel().setExecution(new Execution(Execution.Context.createContextStub(new IndexFacts(indexModel))));
-            assertEquals("WEAKAND(100) myfield:a (AND myfield:b myfield:c myfield:d) myfield:e", query.getModel().getQueryTree().toString());
-            WeakAndItem root = (WeakAndItem) query.getModel().getQueryTree().getRoot();
+            assertEquals("AND myfield:a myfield:b myfield:c myfield:d myfield:e", query.getModel().getQueryTree().toString());
+            AndItem root = (AndItem) query.getModel().getQueryTree().getRoot();
             WordItem a = (WordItem) root.getItem(0);
-            AndItem and = (AndItem)root.getItem(1);
-            WordItem b = (WordItem) and.getItem(0);
-            WordItem c = (WordItem) and.getItem(1);
-            WordItem d = (WordItem) and.getItem(2);
-            WordItem e = (WordItem) root.getItem(2);
+            WordItem b = (WordItem) root.getItem(1);
+            WordItem c = (WordItem) root.getItem(2);
+            WordItem d = (WordItem) root.getItem(3);
+            WordItem e = (WordItem) root.getItem(4);
             assertNull(a.getConnectedItem());
             assertEquals(c, b.getConnectedItem());
             assertEquals(1.0, b.getConnectivity(), 0.00000001);
             assertEquals(d, c.getConnectedItem());
             assertEquals(1.0, c.getConnectivity(), 0.00000001);
             assertNull(d.getConnectedItem());
-            assertEquals("e", e.getIndexedString());
         }
     }
 
@@ -1067,7 +1063,7 @@ public class QueryTestCase {
         IndexModel indexModel = new IndexModel(test);
         query.getModel().setExecution(new Execution(Execution.Context.createContextStub(new IndexFacts(indexModel))));
 
-        assertEquals("WEAKAND(100) myfield:\"'it s' fine\"", query.getModel().getQueryTree().toString());
+        assertEquals("myfield:\"'it s' fine\"", query.getModel().getQueryTree().toString());
     }
 
     @Test
diff --git a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
index eb07692691b..1cc810aee7d 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
@@ -128,7 +128,7 @@ public class MinimalQueryInserterTestCase {
     public void testSearch() {
         Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userQuery()");
         execution.search(query);
-        assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna easilyRecognizedString", query.getModel().getQueryTree().toString());
         assertEquals(Language.ENGLISH, query.getModel().getParsingLanguage());
     }
 
@@ -156,7 +156,7 @@ public class MinimalQueryInserterTestCase {
         Query query = new Query("search/?userString=" + encode(japaneseWord) + "&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userInput(@userString)");
         execution.search(query);
         assertEquals(Language.JAPANESE, query.getModel().getParsingLanguage());
-        assertEquals("AND title:madonna (WEAKAND(100) default:" + japaneseWord + ")", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna default:" + japaneseWord, query.getModel().getQueryTree().toString());
     }
 
     @Test
@@ -165,21 +165,21 @@ public class MinimalQueryInserterTestCase {
         Query query = new Query("search/?query=" + encode(japaneseWord) + "&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userQuery()");
         execution.search(query);
         assertEquals(Language.JAPANESE, query.getModel().getParsingLanguage());
-        assertEquals("AND title:madonna (WEAKAND(100) " + japaneseWord + ")", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna " + japaneseWord, query.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testUserQueryFailsWithoutArgument() {
         Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userQuery()");
         execution.search(query);
-        assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna easilyRecognizedString", query.getModel().getQueryTree().toString());
     }
 
     @Test
     public void testSearchFromAllSourcesWithUserSource() {
         Query query = new Query("search/?query=easilyRecognizedString&sources=abc&yql=select%20ignoredfield%20from%20sources%20*%20where%20title%20contains%20%22madonna%22%20and%20userQuery()");
         execution.search(query);
-        assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna easilyRecognizedString", query.getModel().getQueryTree().toString());
         assertEquals(0, query.getModel().getSources().size());
     }
 
@@ -187,7 +187,7 @@ public class MinimalQueryInserterTestCase {
     public void testSearchFromAllSourcesWithoutUserSource() {
         Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20sources%20*%20where%20title%20contains%20%22madonna%22%20and%20userQuery()");
         execution.search(query);
-        assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna easilyRecognizedString", query.getModel().getQueryTree().toString());
         assertEquals(0, query.getModel().getSources().size());
     }
 
@@ -195,7 +195,7 @@ public class MinimalQueryInserterTestCase {
     public void testSearchFromSomeSourcesWithoutUserSource() {
         Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20sources%20sourceA,%20sourceB%20where%20title%20contains%20%22madonna%22%20and%20userQuery()");
         execution.search(query);
-        assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna easilyRecognizedString", query.getModel().getQueryTree().toString());
         assertEquals(2, query.getModel().getSources().size());
         assertTrue(query.getModel().getSources().contains("sourceA"));
         assertTrue(query.getModel().getSources().contains("sourceB"));
@@ -205,7 +205,7 @@ public class MinimalQueryInserterTestCase {
     public void testSearchFromSomeSourcesWithUserSource() {
         Query query = new Query("search/?query=easilyRecognizedString&sources=abc&yql=select%20ignoredfield%20from%20sources%20sourceA,%20sourceB%20where%20title%20contains%20%22madonna%22%20and%20userQuery()");
         execution.search(query);
-        assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna easilyRecognizedString", query.getModel().getQueryTree().toString());
         assertEquals(3, query.getModel().getSources().size());
         assertTrue(query.getModel().getSources().contains("sourceA"));
         assertTrue(query.getModel().getSources().contains("sourceB"));
@@ -216,7 +216,7 @@ public class MinimalQueryInserterTestCase {
     public final void testSearchFromSomeSourcesWithOverlappingUserSource() {
         final Query query = new Query("search/?query=easilyRecognizedString&sources=abc,sourceA&yql=select%20ignoredfield%20from%20sources%20sourceA,%20sourceB%20where%20title%20contains%20%22madonna%22%20and%20userQuery()");
         execution.search(query);
-        assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString());
+        assertEquals("AND title:madonna easilyRecognizedString", query.getModel().getQueryTree().toString());
         assertEquals(3, query.getModel().getSources().size());
         assertTrue(query.getModel().getSources().contains("sourceA"));
         assertTrue(query.getModel().getSources().contains("sourceB"));
diff --git a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java
index 9e98372093d..1e36bc3ad45 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java
@@ -50,14 +50,14 @@ public class UserInputTestCase {
             URIBuilder builder = searchUri();
             builder.setParameter("yql", "select * from sources * where userInput(\"nalle\")");
             Query query = searchAndAssertNoErrors(builder);
-            assertEquals("select * from sources * where weakAnd(default contains \"nalle\")", query.yqlRepresentation());
+            assertEquals("select * from sources * where default contains \"nalle\"", query.yqlRepresentation());
         }
         {
             URIBuilder builder = searchUri();
             builder.setParameter("nalle", "bamse");
             builder.setParameter("yql", "select * from sources * where userInput(@nalle)");
             Query query = searchAndAssertNoErrors(builder);
-            assertEquals("select * from sources * where weakAnd(default contains \"bamse\")", query.yqlRepresentation());
+            assertEquals("select * from sources * where default contains \"bamse\"", query.yqlRepresentation());
         }
         {
             URIBuilder builder = searchUri();
@@ -139,7 +139,7 @@ public class UserInputTestCase {
         builder.setParameter("yql",
                 "select * from sources * where [{defaultIndex: \"glompf\"}]userInput(\"nalle\")");
         Query query = searchAndAssertNoErrors(builder);
-        assertEquals("select * from sources * where weakAnd(glompf contains \"nalle\")", query.yqlRepresentation());
+        assertEquals("select * from sources * where glompf contains \"nalle\"", query.yqlRepresentation());
     }
 
     @Test
@@ -149,7 +149,7 @@ public class UserInputTestCase {
                 "select * from sources * where [{stem: false}]userInput(\"nalle\")");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals(
-                "select * from sources * where weakAnd(default contains ([{stem: false}]\"nalle\"))",
+                "select * from sources * where default contains ([{stem: false}]\"nalle\")",
                 query.yqlRepresentation());
     }
 
@@ -160,8 +160,8 @@ public class UserInputTestCase {
         builder.setParameter("yql",
                              "select * from ecitem where rank(([{defaultIndex:\"myfield\"}](userInput(@myinput))))");
         Query query = searchAndAssertNoErrors(builder);
-        assertEquals("select * from ecitem where rank(weakAnd(myfield = (-5)))", query.yqlRepresentation());
-        assertEquals("RANK (WEAKAND(100) myfield:-5)", query.getModel().getQueryTree().getRoot().toString());
+        assertEquals("select * from ecitem where rank(myfield = (-5))", query.yqlRepresentation());
+        assertEquals("RANK myfield:-5", query.getModel().getQueryTree().getRoot().toString());
     }
 
     @Test
@@ -171,7 +171,7 @@ public class UserInputTestCase {
                 "select * from sources * where [{ranked: false}]userInput(\"nalle\")");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals(
-                "select * from sources * where weakAnd(default contains ([{ranked: false}]\"nalle\"))",
+                "select * from sources * where default contains ([{ranked: false}]\"nalle\")",
                 query.yqlRepresentation());
     }
 
@@ -182,7 +182,7 @@ public class UserInputTestCase {
                 "select * from sources * where [{filter: true}]userInput(\"nalle\")");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals(
-                "select * from sources * where weakAnd(default contains ([{filter: true}]\"nalle\"))",
+                "select * from sources * where default contains ([{filter: true}]\"nalle\")",
                 query.yqlRepresentation());
     }
 
@@ -194,7 +194,7 @@ public class UserInputTestCase {
                 "select * from sources * where [{normalizeCase: false}]userInput(\"nalle\")");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals(
-                "select * from sources * where weakAnd(default contains ([{normalizeCase: false}]\"nalle\"))",
+                "select * from sources * where default contains ([{normalizeCase: false}]\"nalle\")",
                 query.yqlRepresentation());
     }
 
@@ -205,7 +205,7 @@ public class UserInputTestCase {
                 "select * from sources * where [{accentDrop: false}]userInput(\"nalle\")");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals(
-                "select * from sources * where weakAnd(default contains ([{accentDrop: false}]\"nalle\"))",
+                "select * from sources * where default contains ([{accentDrop: false}]\"nalle\")",
                 query.yqlRepresentation());
     }
 
@@ -216,7 +216,7 @@ public class UserInputTestCase {
                 "select * from sources * where [{usePositionData: false}]userInput(\"nalle\")");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals(
-                "select * from sources * where weakAnd(default contains ([{usePositionData: false}]\"nalle\"))",
+                "select * from sources * where default contains ([{usePositionData: false}]\"nalle\")",
                 query.yqlRepresentation());
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
index ee71a0efa64..c6811fdc4d4 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
@@ -428,7 +428,7 @@ public class YqlParserTestCase {
         assertFalse(root instanceof ExactStringItem);
         assertEquals("yoni jo dima", ((WordItem)root).getWord());
 
-        root = parse("select foo from bar where {grammar:\"all\"}userInput(\"yoni jo dima\")").getRoot();
+        root = parse("select foo from bar where userInput(\"yoni jo dima\")").getRoot();
         assertTrue(root instanceof AndItem);
         AndItem andItem = (AndItem) root;
         assertEquals(3, andItem.getItemCount());
@@ -1064,7 +1064,7 @@ public class YqlParserTestCase {
     @Test
     public void testUrlHostSearchingDefaultAnchors() {
         // Simple query syntax, for reference
-        assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:google.com&type=all"), false, true, true);
+        assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:google.com"), false, true, true);
 
         // YQL query
         Query yql = new Query();
@@ -1075,7 +1075,7 @@ public class YqlParserTestCase {
     @Test
     public void testUrlHostSearchingNoAnchors() {
         // Simple query syntax, for reference
-        assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:google.com*&type=all"), false, false, true);
+        assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:google.com*"), false, false, true);
 
         // YQL query
         Query yql = new Query();
@@ -1086,7 +1086,7 @@ public class YqlParserTestCase {
     @Test
     public void testUrlHostSearchingBothAnchors() {
         // Simple query syntax, for reference
-        assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:%5Egoogle.com&type=all"), true, true, true); // %5E = ^
+        assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:%5Egoogle.com"), true, true, true); // %5E = ^
 
         // YQL query
         Query yql = new Query();
@@ -1097,7 +1097,7 @@ public class YqlParserTestCase {
     @Test
     public void testUriNonHostDoesNotCreateAnchors() {
         // Simple query syntax, for reference
-        assertUrlQuery("urlfield", new Query("?query=urlfield:google.com&type=all"), false, false, false);
+        assertUrlQuery("urlfield", new Query("?query=urlfield:google.com"), false, false, false);
 
         // YQL query
         Query yql = new Query();