2 files changed, 5 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InvokerResult.java b/container-search/src/main/java/com/yahoo/search/dispatch/InvokerResult.java
index d57cd1e2a21..3e952ed2291 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InvokerResult.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InvokerResult.java
@@ -46,6 +46,9 @@ public class InvokerResult {
             if (hit.hasSortData()) {
                 fh.setSortData(hit.getSortData(), sorting);
             }
+            if (hit.hasMatchFeatures()) {
+                fh.setField("matchfeatures", hit.getMatchFeatures());
+            }
             fh.setQuery(query);
             fh.setFillable();
             fh.setCached(false);
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java b/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
index 6a47e19e310..03b0f092abb 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
@@ -36,8 +36,9 @@ public class LeanHit implements Comparable<LeanHit> {
     public boolean hasSortData() { return sortData != null; }
     public int getPartId() { return partId; }
     public int getDistributionKey() { return distributionKey; }
-    public FeatureData getMatchFeatures() { return matchFeatures; }
 
+    public FeatureData getMatchFeatures() { return matchFeatures; }
+    public boolean hasMatchFeatures() { return matchFeatures != null; }
     public void addMatchFeatures(Inspector features) {
         matchFeatures = new FeatureData(features);
     }