diff --git a/build.gradle b/build.gradle
index c8d8f59..0e8e119 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'de.jottyfan.camporganizer'
-version = '0.6.7'
+version = '0.6.8'
 
 description = """CampOrganizer2"""
 
diff --git a/src/main/java/de/jottyfan/camporganizer/module/admin/AdminRepository.java b/src/main/java/de/jottyfan/camporganizer/module/admin/AdminRepository.java
index 5b7d560..9e9d7f2 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/admin/AdminRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/admin/AdminRepository.java
@@ -17,6 +17,7 @@ import java.util.List;
 import java.util.Set;
 
 import jakarta.validation.Valid;
+import java.util.Iterator;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -131,7 +132,9 @@ public class AdminRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<DocumentBean> list = new ArrayList<>();
-		for (Record5<Integer, String, EnumDocument, EnumFiletype, EnumCamprole[]> r : sql.fetch()) {
+		Iterator<Record5<Integer, String, EnumDocument, EnumFiletype, EnumCamprole[]>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record5<Integer, String, EnumDocument, EnumFiletype, EnumCamprole[]> r = i.next();
 			DocumentBean bean = new DocumentBean();
 			bean.setPk(r.get(T_DOCUMENT.PK));
 			bean.setName(r.get(T_DOCUMENT.NAME));
@@ -162,7 +165,9 @@ public class AdminRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<DocumentBean> list = new ArrayList<>();
-		for (Record4<Integer, String, EnumDocument, EnumFiletype> r : sql.fetch()) {
+		Iterator<Record4<Integer, String, EnumDocument, EnumFiletype>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record4<Integer, String, EnumDocument, EnumFiletype> r = i.next();
 			DocumentBean bean = new DocumentBean();
 			bean.setPk(r.get(T_DOCUMENT.PK));
 			bean.setName(r.get(T_DOCUMENT.NAME));
@@ -527,7 +532,9 @@ public class AdminRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		PrivilegesContainerBean pcb = new PrivilegesContainerBean();
-		for (Record4<Integer, String, LocalDateTime, String> r : sql.fetch()) {
+		Iterator<Record4<Integer, String, LocalDateTime, String>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record4<Integer, String, LocalDateTime, String> r = i.next();
 			Integer fkCampProfile = r.get(T_CAMPPROFILE.PK);
 			String username = r.get(T_PROFILE.USERNAME);
 			String campname = r.get(T_CAMP.NAME);
@@ -562,7 +569,9 @@ public class AdminRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		PrivilegesContainerBean pcb = new PrivilegesContainerBean();
-		for (Record4<Integer, String, LocalDateTime, EnumModule> r : sql.fetch()) {
+		Iterator<Record4<Integer, String, LocalDateTime, EnumModule>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record4<Integer, String, LocalDateTime, EnumModule> r = i.next();
 			Integer fkCampProfile = r.get(T_CAMPPROFILE.PK);
 			EnumModule moduleEnum = r.get(T_CAMPPROFILE.MODULE);
 			String module = moduleEnum == null ? null : moduleEnum.getLiteral();
@@ -599,7 +608,9 @@ public class AdminRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		PrivilegesContainerBean pcb = new PrivilegesContainerBean();
-		for (Record4<Integer, String, String, EnumModule> r : sql.fetch()) {
+		Iterator<Record4<Integer, String, String, EnumModule>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record4<Integer, String, String, EnumModule> r = i.next();
 			Integer fkCampProfile = r.get(T_CAMPPROFILE.PK);
 			EnumModule moduleEnum = r.get(T_CAMPPROFILE.MODULE);
 			String forename = r.get(T_PROFILE.FORENAME);
diff --git a/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsRepository.java b/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsRepository.java
index 47dee5e..b510bbf 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsRepository.java
@@ -8,6 +8,7 @@ import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
@@ -63,7 +64,9 @@ public class BookingsRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<BookerBean> list = new ArrayList<>();
-		for (Record r : sql.fetch()) {
+		Iterator<Record10<Integer, Boolean, BigDecimal, String, String, EnumCamprole, EnumSex, LocalDateTime, String, Double>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record10<Integer, Boolean, BigDecimal, String, String, EnumCamprole, EnumSex, LocalDateTime, String, Double> r = i.next();
 			String forename = r.get(T_PERSON.FORENAME);
 			String surname = r.get(T_PERSON.SURNAME);
 			EnumCamprole role = r.get(T_PERSON.CAMPROLE);
diff --git a/src/main/java/de/jottyfan/camporganizer/module/business/business/BusinessRepository.java b/src/main/java/de/jottyfan/camporganizer/module/business/business/BusinessRepository.java
index 10d5d4b..99cd968 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/business/business/BusinessRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/business/business/BusinessRepository.java
@@ -1,20 +1,22 @@
 package de.jottyfan.camporganizer.module.business.business;
 
 import static de.jottyfan.camporganizer.db.jooq.Tables.T_CAMP;
+import static de.jottyfan.camporganizer.db.jooq.Tables.T_CAMPPROFILE;
 import static de.jottyfan.camporganizer.db.jooq.Tables.T_LOCATION;
 import static de.jottyfan.camporganizer.db.jooq.Tables.T_PERSON;
 import static de.jottyfan.camporganizer.db.jooq.Tables.T_PROFILE;
-import static de.jottyfan.camporganizer.db.jooq.Tables.T_CAMPPROFILE;
 import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP_BUDGET;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.DSLContext;
+import org.jooq.Record;
 import org.jooq.Record4;
 import org.jooq.Record9;
 import org.jooq.SelectConditionStep;
@@ -65,7 +67,9 @@ public class BusinessRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<CampBudgetBean> list = new ArrayList<>();
-		for (Record4<BigDecimal, String, Double, Integer> r : sql.fetch()) {
+		Iterator<Record4<BigDecimal, String, Double, Integer>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record r = i.next();
 			BigDecimal b = r.get(V_CAMP_BUDGET.BUDGET);
 			String n = r.get(V_CAMP_BUDGET.CAMP_NAME);
 			Double y = r.get(V_CAMP_BUDGET.YEAR);
@@ -103,7 +107,9 @@ public class BusinessRepository {
 	  // @formatter:on
 		LOGGER.debug(sql.toString());
 		List<BusinessBean> list = new ArrayList<>();
-		for (Record9<Integer, String, String, String, String, LocalDateTime, String, BigDecimal, BigDecimal> r : sql.fetch()) {
+		Iterator<Record9<Integer, String, String, String, String, LocalDateTime, String, BigDecimal, BigDecimal>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record9<Integer, String, String, String, String, LocalDateTime, String, BigDecimal, BigDecimal> r = i.next();
 			Integer fkPerson = r.get(T_PERSON.PK);
 			String forename = r.get(T_PERSON.FORENAME);
 			String surname = r.get(T_PERSON.SURNAME);
diff --git a/src/main/java/de/jottyfan/camporganizer/module/business/camp/CampRepository.java b/src/main/java/de/jottyfan/camporganizer/module/business/camp/CampRepository.java
index ffd4a21..f60ff03 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/business/camp/CampRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/business/camp/CampRepository.java
@@ -1,19 +1,19 @@
 package de.jottyfan.camporganizer.module.business.camp;
 
+import static de.jottyfan.camporganizer.db.jooq.Tables.T_CAMPPROFILE;
 import static de.jottyfan.camporganizer.db.jooq.Tables.T_PERSON;
 import static de.jottyfan.camporganizer.db.jooq.Tables.T_PROFILE;
-import static de.jottyfan.camporganizer.db.jooq.Tables.T_CAMPPROFILE;
 import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.DSLContext;
-import org.jooq.Record;
 import org.jooq.Record6;
 import org.jooq.Record8;
 import org.jooq.SelectConditionStep;
@@ -62,7 +62,9 @@ public class CampRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		CampBean bean = new CampBean();
-		for (Record6<String, Double, LocalDateTime, LocalDateTime, String, String> r : sql.fetch()) {
+		Iterator<Record6<String, Double, LocalDateTime, LocalDateTime, String, String>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record6<String, Double, LocalDateTime, LocalDateTime, String, String> r = i.next();
 			bean.setName(r.get(V_CAMP.NAME));
 			bean.setYear(r.get(V_CAMP.YEAR));
 			bean.setArrive(r.get(V_CAMP.ARRIVE));
@@ -94,7 +96,9 @@ public class CampRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<PersonBean> list = new ArrayList<>();
-		for (Record r : sql.fetch()) {
+		Iterator<Record8<Integer, Boolean, BigDecimal, String, String, EnumCamprole, EnumSex, LocalDateTime>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record8<Integer, Boolean, BigDecimal, String, String, EnumCamprole, EnumSex, LocalDateTime> r = i.next();
 			String forename = r.get(T_PERSON.FORENAME);
 			String surname = r.get(T_PERSON.SURNAME);
 			EnumCamprole role = r.get(T_PERSON.CAMPROLE);
diff --git a/src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistGateway.java b/src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistRepository.java
similarity index 95%
rename from src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistGateway.java
rename to src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistRepository.java
index 33c9e9b..275d342 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistGateway.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistRepository.java
@@ -12,6 +12,7 @@ import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -45,8 +46,8 @@ import de.jottyfan.camporganizer.module.camplist.model.DocumentBean;
  */
 @Repository
 @Transactional(transactionManager = "transactionManager")
-public class CamplistGateway {
-	private static final Logger LOGGER = LogManager.getLogger(CamplistGateway.class);
+public class CamplistRepository {
+	private static final Logger LOGGER = LogManager.getLogger(CamplistRepository.class);
 
 	@Autowired
 	private DSLContext jooq;
@@ -100,7 +101,9 @@ public class CamplistGateway {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<BookingBean> list = new ArrayList<>();
-		for (Record r : sql.fetch()) {
+		Iterator<Record> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record r = i.next();
 			Integer fkCamp = r.get(T_PERSON.FK_CAMP);
 			BookingBean bean = new BookingBean();
 			bean.setPk(r.get(T_PERSON.PK));
@@ -184,7 +187,9 @@ public class CamplistGateway {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		Map<Integer, String> map = new HashMap<>(); // no duplicate on using a map
-		for (Record r : sql.fetch()) {
+		Iterator<Record2<String, Integer>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record2<String, Integer> r = i.next();
 			map.put(r.get(T_DOCUMENT.PK), r.get(T_DOCUMENT.NAME));
 		}
 		List<DocumentBean> list = new ArrayList<>();
diff --git a/src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistService.java b/src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistService.java
index 79dc416..e903b70 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistService.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/camplist/CamplistService.java
@@ -25,7 +25,7 @@ import de.jottyfan.camporganizer.module.dashboard.DashboardRepository;
 public class CamplistService {
 
 	@Autowired
-	private CamplistGateway gateway;
+	private CamplistRepository gateway;
 
 	@Autowired
 	private DashboardRepository dashboardGateway;
diff --git a/src/main/java/de/jottyfan/camporganizer/module/confirmation/board/ConfirmationBoardRepository.java b/src/main/java/de/jottyfan/camporganizer/module/confirmation/board/ConfirmationBoardRepository.java
index c5961e5..bb0bdcd 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/confirmation/board/ConfirmationBoardRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/confirmation/board/ConfirmationBoardRepository.java
@@ -7,6 +7,7 @@ import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
@@ -56,7 +57,9 @@ public class ConfirmationBoardRepository {
 		// @formatter:on
 		LOGGER.trace(sql);
 		List<CampBean> list = new ArrayList<>();
-		for (Record6<String, Double, Boolean, String, Integer, LocalDateTime> r : sql.fetch()) {
+		Iterator<Record6<String, Double, Boolean, String, Integer, LocalDateTime>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record6<String, Double, Boolean, String, Integer, LocalDateTime> r = i.next();
 			CampBean bean = new CampBean();
 			bean.setPkCamp(r.get(V_CAMP.PK));
 			bean.setName(r.get(V_CAMP.NAME));
@@ -86,7 +89,9 @@ public class ConfirmationBoardRepository {
 		// @formatter:on
 		LOGGER.trace(sql);
 		List<PersonBean> list = new ArrayList<>();
-		for (Record r : sql.fetch()) {
+		Iterator<Record> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record r = i.next();
 			PersonBean bean = new PersonBean();
 			bean.setAccept(r.get(T_PERSON.ACCEPT));
 			bean.setBirthDate(r.get(T_PERSON.BIRTHDATE));
@@ -126,8 +131,9 @@ public class ConfirmationBoardRepository {
 			.and(V_CAMP.PK.eq(campId));
 		// @formatter:on
 		LOGGER.trace(sql);
-		for (Record2<String, LocalDateTime> r : sql.fetch()) {
-			return r.get(V_CAMP.ARRIVE);
+		Iterator<Record2<String, LocalDateTime>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			return i.next().get(V_CAMP.ARRIVE);
 		}
 		return null;
 	}
diff --git a/src/main/java/de/jottyfan/camporganizer/module/confirmation/confirmation/ConfirmationRepository.java b/src/main/java/de/jottyfan/camporganizer/module/confirmation/confirmation/ConfirmationRepository.java
index 22660d5..d77f0c9 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/confirmation/confirmation/ConfirmationRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/confirmation/confirmation/ConfirmationRepository.java
@@ -10,6 +10,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -71,7 +72,9 @@ public class ConfirmationRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		Map<LocalDateTime, CampOverviewBean> map = new HashMap<>();
-		for (Record4<Integer, Boolean, String, LocalDateTime> r : sql.fetch()) {
+		Iterator<Record4<Integer, Boolean, String, LocalDateTime>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record4<Integer, Boolean, String, LocalDateTime> r = i.next();
 			Integer count = r.get(COUNT, Integer.class);
 			Boolean accept = r.get(T_PERSON.ACCEPT);
 			String campname = r.get(T_CAMP.NAME);
@@ -116,7 +119,9 @@ public class ConfirmationRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<BookingBean> list = new ArrayList<>();
-		for (Record7<Integer, String, String, String, LocalDateTime, EnumCamprole, LocalDateTime> r : sql.fetch()) {
+		Iterator<Record7<Integer, String, String, String, LocalDateTime, EnumCamprole, LocalDateTime>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record7<Integer, String, String, String, LocalDateTime, EnumCamprole, LocalDateTime> r = i.next();
 			String forename = r.get(T_PERSON.FORENAME);
 			String surname = r.get(T_PERSON.SURNAME);
 			String campname = r.get(T_CAMP.NAME);
@@ -192,7 +197,9 @@ public class ConfirmationRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<BookingBean> list = new ArrayList<>();
-		for (Record8<Integer, String, String, EnumCamprole, String, Double, String, Boolean> r : sql.fetch()) {
+		Iterator<Record8<Integer, String, String, EnumCamprole, String, Double, String, Boolean>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record8<Integer, String, String, EnumCamprole, String, Double, String, Boolean> r = i.next();
 			Integer pkPerson = r.get(T_PERSON.PK);
 			String forename = r.get(T_PERSON.FORENAME);
 			String surname = r.get(T_PERSON.SURNAME);
diff --git a/src/main/java/de/jottyfan/camporganizer/module/confirmation/person/PersonRepository.java b/src/main/java/de/jottyfan/camporganizer/module/confirmation/person/PersonRepository.java
index 37c69b8..6f484d2 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/confirmation/person/PersonRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/confirmation/person/PersonRepository.java
@@ -12,6 +12,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
@@ -78,7 +79,9 @@ public class PersonRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		List<CampBean> list = new ArrayList<>();
-		for (Record r : sql.fetch()) {
+		Iterator<Record4<Integer, String, LocalDateTime, String>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record4<Integer, String, LocalDateTime, String> r = i.next();
 			CampBean bean = new CampBean();
 			bean.setPk(r.get(T_CAMP.PK));
 			bean.setName(r.get(T_CAMP.NAME));
@@ -109,7 +112,9 @@ public class PersonRepository {
 			.and(T_PROFILE.USERNAME.eq(username));
 		// @formatter:on
 		LOGGER.debug(sql.toString());
-		for (Record r : sql.fetch()) {
+		Iterator<Record> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record r = i.next();
 			PersonBean bean = new PersonBean();
 			bean.setPk(pk);
 			bean.setAccept(r.get(T_PERSON.ACCEPT));
@@ -295,7 +300,9 @@ public class PersonRepository {
 		// @formatter:on
 		LOGGER.debug(sql.toString());
 		StringBuilder buf = new StringBuilder();
-		for (Record r : sql.fetch()) {
+		Iterator<Record11<LocalDate, LocalDateTime, EnumCamprole, LocalDateTime, LocalDateTime, Integer, Integer, String, String, String, String>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record11<LocalDate, LocalDateTime, EnumCamprole, LocalDateTime, LocalDateTime, Integer, Integer, String, String, String, String> r = i.next();
 			LocalDate birthdate = r.get(T_PERSON.BIRTHDATE);
 			LocalDateTime arrive = r.get(T_CAMP.ARRIVE);
 			LocalDateTime depart = r.get(T_CAMP.DEPART);
diff --git a/src/main/java/de/jottyfan/camporganizer/module/ical/ICalRepository.java b/src/main/java/de/jottyfan/camporganizer/module/ical/ICalRepository.java
index 8e6c1fd..b30e35a 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/ical/ICalRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/ical/ICalRepository.java
@@ -6,6 +6,7 @@ import static de.jottyfan.camporganizer.db.jooq.Tables.T_LOCATION;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.TimeZone;
 
 import org.apache.logging.log4j.LogManager;
@@ -56,7 +57,9 @@ public class ICalRepository {
 		LOGGER.debug(sql.toString());
 		ICalendar ical = new ICalendar();
 		ical.getTimezoneInfo().setDefaultTimezone(TimezoneAssignment.download(TimeZone.getTimeZone("Europe/Berlin"), false));
-		for (Record5<String, LocalDateTime, LocalDateTime, String, String> r : sql.fetch()) {
+		Iterator<Record5<String, LocalDateTime, LocalDateTime, String, String>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record5<String, LocalDateTime, LocalDateTime, String, String> r = i.next();
 			VEvent event = new VEvent();
 			Summary summary = event.setSummary(r.get(T_CAMP.NAME));
 			summary.setLanguage("de");
diff --git a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java
index d7928bc..8bfebbe 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java
@@ -12,6 +12,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 
@@ -316,8 +317,9 @@ public class RegistrationRepository {
 			.where(T_CAMP.PK.eq(fkCamp));
 		// @formatter:on
 		LOGGER.debug(sql.toString());
-		for (Record1<LocalDateTime> r : sql.fetch()) {
-			LocalDateTime depart = r.get(T_CAMP.DEPART);
+		Iterator<Record1<LocalDateTime>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			LocalDateTime depart = i.next().get(T_CAMP.DEPART);
 			LocalDateTime now = LocalDateTime.now();
 			return now.isBefore(depart);
 		}
@@ -424,7 +426,7 @@ public class RegistrationRepository {
 
 	/**
 	 * get the person information of already registered people
-	 * 
+	 *
 	 * @param currentUser the user that registered people
 	 * @return the list of found registrations, may be an empty list; if currentUser is null, return null.
 	 */
@@ -446,7 +448,9 @@ public class RegistrationRepository {
 		// @formatter:on
 		LOGGER.trace(sql);
 		List<RegistrationBean> list = new ArrayList<>();
-		for (Record r : sql.fetch()) {
+		Iterator<Record9<String, String, String, String, String, String, String, EnumSex, LocalDate>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record9<String, String, String, String, String, String, String, EnumSex, LocalDate> r = i.next();
 			RegistrationBean bean = new RegistrationBean();
 			bean.setForename(r.get(T_PERSON.FORENAME));
 			bean.setSurname(r.get(T_PERSON.SURNAME));
diff --git a/src/main/java/de/jottyfan/camporganizer/module/rss/RssGateway.java b/src/main/java/de/jottyfan/camporganizer/module/rss/RssRepository.java
similarity index 86%
rename from src/main/java/de/jottyfan/camporganizer/module/rss/RssGateway.java
rename to src/main/java/de/jottyfan/camporganizer/module/rss/RssRepository.java
index b47d833..75dc577 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/rss/RssGateway.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/rss/RssRepository.java
@@ -4,6 +4,7 @@ import static de.jottyfan.camporganizer.db.jooq.Tables.T_RSS;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
@@ -30,9 +31,9 @@ import de.jottyfan.camporganizer.db.jooq.tables.records.TRssRecord;
  */
 @Repository
 @Transactional(transactionManager = "transactionManager")
-public class RssGateway {
+public class RssRepository {
 
-	private static final Logger LOGGER = LogManager.getLogger(RssGateway.class);
+	private static final Logger LOGGER = LogManager.getLogger(RssRepository.class);
 
 	@Autowired
 	private DSLContext jooq;
@@ -48,7 +49,9 @@ public class RssGateway {
 		// @formatter:on
 		LOGGER.debug("{}", sql.toString());
 		List<RssBean> list = new ArrayList<>();
-		for (Record3<Integer, String, LocalDateTime> r : sql.fetch()) {
+		Iterator<Record3<Integer, String, LocalDateTime>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record3<Integer, String, LocalDateTime> r = i.next();
 			RssBean bean = new RssBean(r.get(T_RSS.PK));
 			bean.setRecipient(recipientCode);
 			bean.setMessage(r.get(T_RSS.MSG));
@@ -75,7 +78,9 @@ public class RssGateway {
 		// @formatter:on
 		LOGGER.debug("{}", sql.toString());
 		List<RssBean> list = new ArrayList<>();
-		for (Record4<Integer, String, String, LocalDateTime> r : sql.fetch()) {
+		Iterator<Record4<Integer, String, String, LocalDateTime>> i = sql.fetch().iterator();
+		while (i.hasNext()) {
+			Record4<Integer, String, String, LocalDateTime> r = i.next();
 			RssBean bean = new RssBean(r.get(T_RSS.PK));
 			bean.setRecipient(r.get(T_RSS.RECIPIENT));
 			bean.setMessage(r.get(T_RSS.MSG));
diff --git a/src/main/java/de/jottyfan/camporganizer/module/rss/RssService.java b/src/main/java/de/jottyfan/camporganizer/module/rss/RssService.java
index b17bc01..ac4d0f2 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/rss/RssService.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/rss/RssService.java
@@ -25,7 +25,7 @@ public class RssService {
 	private static final Logger LOGGER = LogManager.getLogger(RssService.class);
 
 	@Autowired
-	private RssGateway repository;
+	private RssRepository repository;
 
 	/**
 	 * get the recipient's rss feed