1 files changed, 1 insertions, 5 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
index 97a5bdd72ca..3e6e82a5584 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
@@ -37,11 +37,7 @@ public class Organizer {
         sectionGroup.setQuery(result.hits().getQuery());
         if (errors!=null && errors instanceof DefaultErrorHit)
             sectionGroup.add((DefaultErrorHit)errors);
-        for (Iterator<Map.Entry<String, Object>> it = result.hits().fieldIterator(); it.hasNext(); ) {
-            Map.Entry<String, Object> field = it.next();
-            sectionGroup.setField(field.getKey(), field.getValue());
-        }
-
+        result.hits().forEachField((name, value) -> sectionGroup.setField(name, value));
         result.setHits(sectionGroup);
     }