diff --git a/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewBuffer_HighVolume.java b/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewBuffer_HighVolume.java
index 53cc31aa9..91be810b0 100644
--- a/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewBuffer_HighVolume.java
+++ b/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewBuffer_HighVolume.java
@@ -234,7 +234,7 @@ private ViewRowIdsOrderedSelection getSelection(final List<DocumentQueryOrderBy>
 	private PageFetcher<Integer> huIdsPageFetcher(final List<DocumentQueryOrderBy> orderBys)
 	{
 		final ViewRowIdsOrderedSelection selection = getSelection(orderBys);
-		return (firstRow, maxRows) -> huEditorRepo.retrievePagedHUIds(selection, firstRow, maxRows);
+		return (firstRow, maxRows) -> huEditorRepo.retrieveHUIdsPage(selection, firstRow, maxRows);
 	}
 
 	private Stream<Integer> streamHUIdsByPage(final int firstRow, final int maxRows, final List<DocumentQueryOrderBy> orderBys)
diff --git a/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewRepository.java b/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewRepository.java
index 726e4eb48..69932a1f3 100644
--- a/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewRepository.java
+++ b/src/main/java/de/metas/ui/web/handlingunits/HUEditorViewRepository.java
@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Set;
 
+import org.adempiere.util.collections.PagedIterator.Page;
+
 import de.metas.ui.web.document.filter.DocumentFilter;
 import de.metas.ui.web.handlingunits.HUIdsFilterHelper.HUIdsFilterData;
 import de.metas.ui.web.view.ViewId;
@@ -47,7 +49,7 @@ public interface HUEditorViewRepository
 
 	List<Integer> retrieveHUIdsEffective(HUIdsFilterData huIdsFilter, List<DocumentFilter> filters);
 
-	Set<Integer> retrievePagedHUIds(ViewRowIdsOrderedSelection selection, int firstRow, int maxRows);
+	Page<Integer> retrieveHUIdsPage(ViewRowIdsOrderedSelection selection, int firstRow, int maxRows);
 
 	ViewRowIdsOrderedSelection createDefaultSelection(ViewId viewId, List<DocumentFilter> filters);
 
diff --git a/src/main/java/de/metas/ui/web/handlingunits/SqlHUEditorViewRepository.java b/src/main/java/de/metas/ui/web/handlingunits/SqlHUEditorViewRepository.java
index 9561dfe5c..b11c43046 100644
--- a/src/main/java/de/metas/ui/web/handlingunits/SqlHUEditorViewRepository.java
+++ b/src/main/java/de/metas/ui/web/handlingunits/SqlHUEditorViewRepository.java
@@ -21,6 +21,7 @@
 import org.adempiere.model.PlainContextAware;
 import org.adempiere.util.GuavaCollectors;
 import org.adempiere.util.Services;
+import org.adempiere.util.collections.PagedIterator.Page;
 import org.compiere.model.I_C_UOM;
 import org.compiere.model.I_M_Product;
 import org.compiere.util.DB;
@@ -428,7 +429,7 @@ else if (huIdsFilter.getMustHUIds() != null)
 	}
 
 	@Override
-	public Set<Integer> retrievePagedHUIds(final ViewRowIdsOrderedSelection selection, final int firstRow, final int maxRows)
+	public Page<Integer> retrieveHUIdsPage(final ViewRowIdsOrderedSelection selection, final int firstRow, final int maxRows)
 	{
 		final int firstSeqNo = firstRow + 1; // NOTE: firstRow is 0-based while SeqNo are 1-based
 		final int lastSeqNo = firstRow + maxRows;
@@ -458,8 +459,7 @@ public Set<Integer> retrievePagedHUIds(final ViewRowIdsOrderedSelection selectio
 				huIds.add(huId);
 			}
 
-			return huIds;
-
+			return Page.ofRows(ImmutableList.copyOf(huIds));
 		}
 		catch (final SQLException ex)
 		{
diff --git a/src/test/java/de/metas/ui/web/picking/pickingslot/MockedHUEditorViewRepository.java b/src/test/java/de/metas/ui/web/picking/pickingslot/MockedHUEditorViewRepository.java
index 00a09af02..2beae277d 100644
--- a/src/test/java/de/metas/ui/web/picking/pickingslot/MockedHUEditorViewRepository.java
+++ b/src/test/java/de/metas/ui/web/picking/pickingslot/MockedHUEditorViewRepository.java
@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.Set;
 
+import org.adempiere.util.collections.PagedIterator.Page;
+
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 
@@ -83,7 +85,7 @@ public List<Integer> retrieveHUIdsEffective(final HUIdsFilterData huIdsFilter, f
 	}
 
 	@Override
-	public Set<Integer> retrievePagedHUIds(final ViewRowIdsOrderedSelection selection, final int firstRow, final int maxRows)
+	public Page<Integer> retrieveHUIdsPage(final ViewRowIdsOrderedSelection selection, final int firstRow, final int maxRows)
 	{
 		throw new UnsupportedOperationException("not implemented");
 	}