1 files changed, 9 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
index 7d88985b2d5..f6a022e9930 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
@@ -82,7 +82,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
         }
 
         // Commands for summary fields
-        // TODO: Move to fieldinfo and implement differently. This is not right
+        // TODO: Move to schemainfo and implement differently
         for (SummaryField summaryField : schema.getUniqueNamedSummaryFields().values()) {
             if (summaryField.getTransform().isTeaser()) {
                 addIndexCommand(summaryField.getName(), CMD_DYNTEASER);
@@ -90,6 +90,13 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
             if (summaryField.getTransform().isBolded()) {
                 addIndexCommand(summaryField.getName(), CMD_HIGHLIGHT);
             }
+
+            var sourceField = schema.getField(summaryField.getSourceField()); // Take the first as they should all be consistent
+            if (sourceField != null && sourceField.getMatching().getType().equals(MatchType.GRAM)) {
+                addIndexCommand(summaryField.getName(),
+                                "ngram " + (sourceField.getMatching().getGramSize().orElse(NGramMatch.DEFAULT_GRAM_SIZE)));
+
+            }
         }
     }
 
@@ -452,7 +459,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
                 iiB.command(
                         new IndexInfoConfig.Indexinfo.Command.Builder()
                             .indexname(fieldSet.getName())
-                            .command("ngram "+(fieldSetMatching.getGramSize()>0 ? fieldSetMatching.getGramSize() : NGramMatch.DEFAULT_GRAM_SIZE)));
+                            .command("ngram " + fieldSetMatching.getGramSize().orElse(NGramMatch.DEFAULT_GRAM_SIZE)));
             } else if (fieldSetMatching.getType().equals(MatchType.TEXT)) {
                 
             }