1 files changed, 5 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
index 658eea0b526..cd9b64da90b 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
@@ -28,6 +28,7 @@ import com.yahoo.vdslib.VisitorStatistics;
 import com.yahoo.vespa.objects.BufferSerializer;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -112,8 +113,8 @@ class StreamingVisitor extends VisitorDataHandler implements Visitor {
         return query.properties().getString(streamingSelection);
     }
 
-    private void setVisitorParameters(String searchCluster, Route route, String documentType) {
-        params.setDocumentSelection(createSelectionString(documentType, createQuerySelectionString()));
+    private void setVisitorParameters(String searchCluster, Route route, String schema) {
+        params.setDocumentSelection(createSelectionString(schema, createQuerySelectionString()));
         params.setTimeoutMs(query.getTimeout()); // Per bucket visitor timeout
         params.setSessionTimeoutMs(query.getTimeout());
         params.setVisitorLibrary("searchvisitor");
@@ -146,7 +147,8 @@ class StreamingVisitor extends VisitorDataHandler implements Visitor {
         encodeQueryData(query, 0, ed);
         params.setLibraryParameter("query", ed.getEncodedData());
         params.setLibraryParameter("querystackcount", String.valueOf(ed.getReturned()));
-        params.setLibraryParameter("searchcluster", searchCluster.getBytes());
+        params.setLibraryParameter("searchcluster", searchCluster.getBytes(StandardCharsets.UTF_8));
+        params.setLibraryParameter("schema", schema.getBytes(StandardCharsets.UTF_8));
         if (query.getPresentation().getSummary() != null) {
             params.setLibraryParameter("summaryclass", query.getPresentation().getSummary());
         } else {