1 files changed, 10 insertions, 11 deletions
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
index ded59413411..27da8c0cf9b 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
@@ -105,16 +105,16 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         }
     }
 
-    public VdsVisitor(Query query, String searchCluster, Route route, String documentType) {
-        this(query, searchCluster, route, documentType, new MessageBusVisitorSessionFactory());
+    public VdsVisitor(Query query, String searchCluster, Route route) {
+        this.query = query;
+        visitorSessionFactory = new MessageBusVisitorSessionFactory();
+        setVisitorParameters(searchCluster, route);
     }
 
-    public VdsVisitor(Query query, String searchCluster, Route route,
-                      String documentType, VisitorSessionFactory visitorSessionFactory)
-    {
+    public VdsVisitor(Query query, String searchCluster, Route route, VisitorSessionFactory visitorSessionFactory) {
         this.query = query;
         this.visitorSessionFactory = visitorSessionFactory;
-        setVisitorParameters(searchCluster, route, documentType);
+        setVisitorParameters(searchCluster, route);
     }
 
     private static int inferSessionTraceLevel(Query query) {
@@ -127,14 +127,13 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         return Math.max(query.getTraceLevel(), implicitLevel);
     }
 
-    private void setVisitorParameters(String searchCluster, Route route, String documentType) {
-        String limitDocumentType = documentType + " and ";
+    private void setVisitorParameters(String searchCluster, Route route) {
         if (query.properties().getString(streamingUserid) != null) {
-            params.setDocumentSelection(limitDocumentType + "id.user==" + query.properties().getString(streamingUserid));
+            params.setDocumentSelection("id.user==" + query.properties().getString(streamingUserid));
         } else if (query.properties().getString(streamingGroupname) != null) {
-            params.setDocumentSelection(limitDocumentType + "id.group==\"" + query.properties().getString(streamingGroupname) + "\"");
+            params.setDocumentSelection("id.group==\"" + query.properties().getString(streamingGroupname) + "\"");
         } else if (query.properties().getString(streamingSelection) != null) {
-            params.setDocumentSelection(limitDocumentType + query.properties().getString(streamingSelection));
+            params.setDocumentSelection(query.properties().getString(streamingSelection));
         }
         params.setTimeoutMs(query.getTimeout()); // Per bucket visitor timeout
         params.setSessionTimeoutMs(query.getTimeout());