1 files changed, 4 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
index ad1e8525b4b..38d09c3ddf4 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
@@ -142,6 +142,10 @@ public abstract class AbstractParser implements CustomParser {
     private Item parse(String queryToParse, String filterToParse, Language parsingLanguage,
                        IndexFacts.Session indexFacts, String defaultIndex, Parsable parsable) {
         if (queryToParse == null) return null;
+
+        if (defaultIndexName != null)
+            defaultIndexName = indexFacts.getCanonicName(defaultIndex);
+
         tokenize(queryToParse, defaultIndex, indexFacts, parsingLanguage);
 
         if (parsingLanguage == null && parsable != null) {