1 files changed, 6 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java b/container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java
index 14dce2f6342..75c2865d0a5 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java
@@ -52,7 +52,12 @@ public class FieldFilter extends Searcher {
         for (Iterator<Hit> i = result.hits().unorderedDeepIterator(); i.hasNext();) {
             Hit h = i.next();
             if (h.isMeta()) continue;
-            h.fieldKeys().retainAll(requestedFields);
+            for (Iterator<Entry<String, Object>> fields = h.fieldIterator(); fields.hasNext();) {
+                Entry<String, Object> field = fields.next();
+                if ( ! requestedFields.contains(field.getKey()))
+                    fields.remove();
+            }
+
         }
     }