Index: AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml
===================================================================
diff -u -r42534 -r42592
--- AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml	(.../WHSReservationHierarchyItemIterator.cls.xml)	(revision 42534)
+++ AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml	(.../WHSReservationHierarchyItemIterator.cls.xml)	(revision 42592)
@@ -3,6 +3,11 @@
 <Class name="AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
+<Property name="DynIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="QueryAPI">
 <Type>TECH.Query.QueryAPI</Type>
 <Private>1</Private>
@@ -27,6 +32,9 @@
 <Implementation><![CDATA[
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
 	Do ..VoerUitQuery()
+	Set Filter = ##class(AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemIteratorFilter).%New()
+	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
+	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
 	Set ..Converter = ##class(AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemDixfConverter).%New(Vestiging)
 	Quit $$$OK
 ]]></Implementation>
@@ -46,14 +54,14 @@
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ( ..ResultSet.Next() > 0 )
+<Implementation><![CDATA[	Quit ..DynIterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem</ReturnType>
 <Implementation><![CDATA[
-	#dim ConvertedProduct As AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem = ..Converter.Convert(..ResultSet.GetData(1))
+	#dim ConvertedProduct As AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem = ..Converter.Convert(..DynIterator.Next().GetData(1))
 	
 	Quit ConvertedProduct
 ]]></Implementation>