1 files changed, 8 insertions, 8 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 77cd4f3b292..1c38bb8f876 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -235,18 +235,18 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
     private static final Map<String, CompoundName> propertyAliases;
     static {
         Map<String,CompoundName> propertyAliasesBuilder = new HashMap<>();
-        addAliases(Query.getArgumentType(), propertyAliasesBuilder);
-        addAliases(Ranking.getArgumentType(), propertyAliasesBuilder);
-        addAliases(Model.getArgumentType(), propertyAliasesBuilder);
-        addAliases(Presentation.getArgumentType(), propertyAliasesBuilder);
-        addAliases(Select.getArgumentType(), propertyAliasesBuilder);
+        addAliases(Query.getArgumentType(), CompoundName.empty, propertyAliasesBuilder);
         propertyAliases = ImmutableMap.copyOf(propertyAliasesBuilder);
     }
-    private static void addAliases(QueryProfileType arguments, Map<String, CompoundName> aliases) {
-        CompoundName prefix = getPrefix(arguments);
+    private static void addAliases(QueryProfileType arguments, CompoundName prefix, Map<String, CompoundName> aliases) {
         for (FieldDescription field : arguments.fields().values()) {
             for (String alias : field.getAliases())
                 aliases.put(alias, prefix.append(field.getName()));
+            if (field.getType() instanceof QueryProfileFieldType) {
+                var type = ((QueryProfileFieldType) field.getType()).getQueryProfileType();
+                if (type != null)
+                    addAliases(type, prefix.append(type.getComponentIdAsCompoundName()), aliases);
+            }
         }
     }
 
@@ -1117,7 +1117,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
 
     /**
      * Prepares this for binary serialization.
-     * <p>
+     *
      * This must be invoked after all changes have been made to this query before it is passed
      * on to a receiving backend. Calling it is somewhat expensive, so it should only happen once.
      * If a prepared query is cloned, it stays prepared.