1 files changed, 4 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
index 1d89a5d7a68..12aec81a5f8 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
@@ -597,7 +597,7 @@ public class VespaSerializer {
             SameElementItem sameElement = (SameElementItem) item;
 
             if (includeField) {
-                destination.append(normalizeIndexName(sameElement.getCommonPath())).append(" contains ");
+                destination.append(normalizeIndexName(sameElement.getFieldName())).append(" contains ");
             }
 
             destination.append(SAME_ELEMENT).append('(');
@@ -607,8 +607,9 @@ public class VespaSerializer {
                 }
                 Item current = sameElement.getItem(i);
                 if (current instanceof WordItem) {
-                    new WordSerializer().serialize(destination, current);
-
+                    WordItem modified = (WordItem)current.clone();
+                    modified.setIndexName(sameElement.extractSubFieldName(modified));
+                    new WordSerializer().serialize(destination, modified);
                 } else {
                     throw new IllegalArgumentException(
                             "Serializing of " + current.getClass().getSimpleName()