URL-parameters now overrides JSON-parameters

1 files changed, 2 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index efd3a44f095..c6d877c006a 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -580,9 +580,10 @@ public class SearchHandler extends LoggingRequestHandler {
             // Create request-mapping
             Map<String, String> requestMap = new HashMap<>();
 
-            request.propertyMap().forEach(requestMap::put);
             createRequestMapping(inspector, requestMap, "");
 
+            requestMap.putAll(request.propertyMap());
+
             // Throws QueryException if query contains both yql- and select-parameter
             if (requestMap.containsKey("yql") && (requestMap.containsKey("select.where") || requestMap.containsKey("select.grouping")) ) {
                 throw new QueryException("Illegal query: Query contains both yql- and select-parameter");