Value nodes have priority over non-value nodes

1 files changed, 5 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java
index 2b61dc4c0a6..3c336c80d37 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java
@@ -47,7 +47,11 @@ final class AllValuesQueryProfileVisitor extends PrefixQueryProfileVisitor {
                           DimensionValues variant,
                           DimensionBinding binding) {
         CompoundName fullName = currentPrefix.append(key);
-        if (values.containsKey(fullName.toString())) return; // The first value encountered has priority
+
+        ValueWithSource existing = values.get(fullName.toString());
+
+        // The first value encountered has priority and values have priority over profiles
+        if (existing != null && (existing.value() != null || value == null)) return;
 
         Boolean isOverridable = owner != null ? owner.isLocalOverridable(key, binding) : null;