Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r1948 -r2270
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 1948)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 2270)
@@ -154,15 +154,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKindBouwstenenIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefKostBouwsteenLijst("K",0))
+]]></Implementation>
+</Method>
+
+<Method name="GeefHFBouwstenenIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefKostBouwsteenLijst("H",0))
+]]></Implementation>
+</Method>
+
 <Method name="GeefKostBouwstenenIterator">
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefKostBouwsteenLijst(0))
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefKostBouwsteenLijst("T",0))
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKostSchaduwBouwstenenIt">
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefKostBouwsteenLijst(1))
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefKostBouwsteenLijst("T",1))
 ]]></Implementation>
 </Method>
 
@@ -188,21 +200,21 @@
 </Method>
 
 <Method name="GeefKostBouwsteenLijst">
-<FormalSpec>IsSchaduw:%Boolean</FormalSpec>
+<FormalSpec>Type:%String,IsSchaduw:%Boolean</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	Set BouwsteenLijst = ##class(%ListOfObjects).%New()
 	If ('IsSchaduw)
 	{
-		Set Type = "BS"
+		Set Node = "BS"
 	}
 	Else
 	{
-		Set Type = "BSS"
+		Set Node = "BSS"
 	}
-	Set Key = $Order(^PRBS(Type,..ProductNummer,"KST."))
-	While ((Key '= "") && (Key [ "KST."))
+	Set Key = $Order(^PRBS(Node,..ProductNummer,""))
+	While (Key '= "")
 	{
 		If ('IsSchaduw)
 		{
@@ -212,8 +224,11 @@
 		{
 			Set Bouwsteen = ##class(DOM.PM.Bouwstenen.SchBouwsteen).%OpenId(..ProductNummer_"||"_Key)
 		}
-		Do BouwsteenLijst.Insert(Bouwsteen)
-		Set Key = $Order(^PRBS(Type,..ProductNummer,Key))
+		If (Bouwsteen.Type = Type)
+		{
+			Do BouwsteenLijst.Insert(Bouwsteen)
+		}
+		Set Key = $Order(^PRBS(Node,..ProductNummer,Key))
 	}
 	
 	Quit BouwsteenLijst