Index: vhTest/Fake/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml
===================================================================
diff -u -r29879 -r30285
--- vhTest/Fake/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 29879)
+++ vhTest/Fake/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30285)
@@ -18,6 +18,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="GeefHalffabItemsIteratorZonderSamengesteldNiveau">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="BevatRol">
 <FormalSpec>Rol:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: APPS/Halux/PPS/Document/impl/common/OnderdelenPicking.cls.xml
===================================================================
diff -u -r30010 -r30285
--- APPS/Halux/PPS/Document/impl/common/OnderdelenPicking.cls.xml	(.../OnderdelenPicking.cls.xml)	(revision 30010)
+++ APPS/Halux/PPS/Document/impl/common/OnderdelenPicking.cls.xml	(.../OnderdelenPicking.cls.xml)	(revision 30285)
@@ -290,7 +290,7 @@
 
 	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = ..IngegevenKenmerkenBepaler.BepaalIngegevenKenmerken(Batch,Product.GeefProductSpecificatie().GeefIngegevenKenmerken())
 	#dim HalffabItemsBoom As DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom = BerekeningService.BerekenHalffabItemsBoom(IngegevenKenmerken,BerekeningsSpecificatie)
-	#dim HalffabItemIt As TECH.Iterator = HalffabItemsBoom.GeefHalffabItemsIterator()
+	#dim HalffabItemIt As TECH.Iterator = HalffabItemsBoom.GeefHalffabItemsIteratorZonderSamengesteldNiveau()
 	
 	While HalffabItemIt.HasNext() {
 		#dim HalffabItem As DOM.PM.Maatwerk.Calc.HF.IHalffabItem = HalffabItemIt.Next()
Index: vhTest/Mock/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml
===================================================================
diff -u -r29059 -r30285
--- vhTest/Mock/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 29059)
+++ vhTest/Mock/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30285)
@@ -40,6 +40,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefHalffabItemsIteratorZonderSamengesteldNiveau">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefHalffabItemsIteratorZonderSamengesteldNiveau")
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderHalffabItem">
 <FormalSpec>HalffabItem:DOM.PM.Maatwerk.Calc.HF.IHalffabItem</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderHalffabItem",HalffabItem)
Index: DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml
===================================================================
diff -u -r30279 -r30285
--- DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30279)
+++ DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30285)
@@ -61,7 +61,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefHalffabItemsIterator">
+<Method name="GeefHalffabItemsIteratorZonderSamengesteldNiveau">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	#dim IsTAOR As %Boolean = (..Wortel.GeefRol() = ##class(DOM.PM.enu.LadeVariant).LogicalToDisplay(##class(DOM.PM.enu.LadeVariant).TAOR()))
@@ -75,20 +75,27 @@
 			If (##class(TECH.StringUtils).Equals(HFItem.GeefRol(), "Rug","Front","ZijkantLinks","ZijkantRechts")) {
 				#dim SubItemsIt As TECH.Iterator = HFItem.GeefHalffabItemsIterator()
 				While (SubItemsIt.HasNext()) {
-					Do HFItemsZoalsVroeger.SetAt(SubItemsIt.Next(),SubItemsIt.Key())
+					Do HFItemsZoalsVroeger.SetAt(SubItemsIt.Next(),HFItem.GeefRol()_"."_SubItemsIt.Key())
 				}
 			}
-			Do HFItemsZoalsVroeger.SetAt(HFItem,HFItemsIt.Key())
+			Else {
+				Do HFItemsZoalsVroeger.SetAt(HFItem,HFItemsIt.Key())
+			}
 		}
 	}
 	Else {
 		Set HFItemsZoalsVroeger = ..HalffabItems
 	}
-	
 
 	Quit ##class(TECH.ListIterator).%New(HFItemsZoalsVroeger)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefHalffabItemsIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..HalffabItems)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/Halux/PPS/Document/ProductieDetailDocument/impl/common/BladInhoudBuilderTemplate.cls.xml
===================================================================
diff -u -r29059 -r30285
--- APPS/Halux/PPS/Document/ProductieDetailDocument/impl/common/BladInhoudBuilderTemplate.cls.xml	(.../BladInhoudBuilderTemplate.cls.xml)	(revision 29059)
+++ APPS/Halux/PPS/Document/ProductieDetailDocument/impl/common/BladInhoudBuilderTemplate.cls.xml	(.../BladInhoudBuilderTemplate.cls.xml)	(revision 30285)
@@ -166,7 +166,7 @@
 		set HalffabItemsBoom = Product.GeefHalffabItemsBoom(##class(DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze).ProductieAansturing())
 	}
 	
-	#dim HalffabItemIt As TECH.Iterator = HalffabItemsBoom.GeefHalffabItemsIterator()
+	#dim HalffabItemIt As TECH.Iterator = HalffabItemsBoom.GeefHalffabItemsIteratorZonderSamengesteldNiveau()
 	While HalffabItemIt.HasNext(){
 		#dim HalffabItem As DOM.PM.Maatwerk.Calc.HF.IHalffabItem = HalffabItemIt.Next()
 		#dim GroepNaam As %String = ..GroepenBepaler.GeefGroepNaamVoorHalffabItem(HalffabItem)