Index: DOM/PM/SubgroepClassificatie.cls.xml
===================================================================
diff -u
--- DOM/PM/SubgroepClassificatie.cls.xml	(revision 0)
+++ DOM/PM/SubgroepClassificatie.cls.xml	(revision 1724)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.PM.SubgroepClassificatie">
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.PM.Classificatie</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="GeefProductIterator">
+<Abstract>1</Abstract>
+<ReturnType>TECH.Iterator</ReturnType>
+</Method>
+</Class>
+</Export>
Index: BL/Prod/Search.cls.xml
===================================================================
diff -u -r1406 -r1724
--- BL/Prod/Search.cls.xml	(.../Search.cls.xml)	(revision 1406)
+++ BL/Prod/Search.cls.xml	(.../Search.cls.xml)	(revision 1724)
@@ -662,42 +662,72 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[Criteria:BL.Prod.sub.pxSearchCriteria,&Result]]></FormalSpec>
 <Implementation><![CDATA[
+	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	Set LijnCnt=0
-	Set MustQuit = 0
 	Set KKeyIterator = ##class(TECH.ListIterator).%New(Criteria.Klassificaties)
-	While(KKeyIterator.HasNext() && 'MustQuit){
+	While(KKeyIterator.HasNext()){
 		Set KKey = KKeyIterator.Next()
-		If KKey=""{ 
-			Set MustQuit = 1
-		}Else{
-			Set KlasRec=$G(^KLAS("K",KKey))
-			If KlasRec=""{ 
-				Set MustQuit = 1
-			}Else{
-				Set StockType=Criteria.StockType
+		Set Classificatie = ProductAPI.GeefClassificatie(KKey)
+		If ($IsObject(Classificatie))
+		{
+			If (Classificatie.GeefNiveau() = ##class(DOM.PM.enu.PMClassificatieNiveau).Hoofdgroep())
+			{
+				Set GroepClassificatieIt = Classificatie.GeefGroepClassificaties()
+				While (GroepClassificatieIt.HasNext())
+				{
+					Set GroepClassificatie = GroepClassificatieIt.Next()
+					Set SubgroepClassificatieIt = GroepClassificatie.GeefSubgroepClassificaties()
+					While (SubgroepClassificatieIt.HasNext())
+					{
+						Set SubgroepClassificatie = SubgroepClassificatieIt.Next()
+						Set ProductIterator = SubgroepClassificatie.GeefProductIterator()
+						While (ProductIterator.HasNext())
+						{
+							Set PRNr = ProductIterator.Next().GeefPRNr()
+							If (..IsToevoegbaarAanBoom(Criteria, PRNr))
+							{
+								Set Result($I(LijnCnt)) = PRNr
+							}
+						}
+					}
+				}
+			}
+			Else
+			{
+				Set KlasRec = ^KLAS("K",KKey)
 				Set HfdGrp=$E(100+$P(KlasRec,"\",2),2,3)_$P(KlasRec,"\",5)_" "
 				Set Grp=$E(HfdGrp,1,4)_$E(100+$P(KlasRec,"\",3),2,3)_$P(KlasRec,"\",6)_" "
 				Set CritSubGrp=""
 				Set:$P(KlasRec,"\")=3 CritSubGrp=$E(Grp,1,9)_$E(100+$P(KlasRec,"\",4),2,3)_$P(KlasRec,"\",7)_" "
 				Set SubGrp=""
 				Set Merk="  "
-				Set KortTekst=""				
+				Set KortTekst=""
 			 	For  Set SubGrp=$O(^KPH(HfdGrp,Grp,SubGrp)) Quit:SubGrp=""  Do:(CritSubGrp="")||(SubGrp=CritSubGrp)
 			 	. For  Set KortTekst=$O(^KPH(HfdGrp,Grp,SubGrp,Merk,KortTekst)) Quit:KortTekst=""  Do
 				. . Set PRNr=^KPH(HfdGrp,Grp,SubGrp,Merk,KortTekst)
-				. . Quit:PRNr'?4.7N
-				. . Quit:(StockType'["A")&&($P($G(^KPR(PRNr,0)),"\",3)?4.7N)
-				. . Set Stock=$$$PRGet($$$StockType)
-				. . Quit:(StockType'["S")&&Stock
-				. . Quit:(StockType'["N")&&'Stock
-				. . ;Quit:'%blProduct.IsAllowed(PRNr)
-				. . Set Result($I(LijnCnt))=PRNr
+				. . If ..IsToevoegbaarAanBoom(Criteria, PRNr)  Do
+				. . . Set Result($I(LijnCnt))=PRNr
 			}
 		}
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="IsToevoegbaarAanBoom">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Criteria:BL.Prod.sub.pxSearchCriteria,PRNr:%Integer</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:PRNr'?4.7N 0
+	Quit:(Criteria.StockType'["A")&&($P($G(^KPR(PRNr,0)),"\",3)?4.7N) 0
+	Set Stock=$$$PRGet($$$StockType)
+	Quit:(Criteria.StockType'["S")&&Stock 0
+	Quit:(Criteria.StockType'["N")&&'Stock 0
+	;Quit:'%blProduct.IsAllowed(PRNr)
+	Quit 1
+]]></Implementation>
+</Method>
+
 <Method name="SearchLangTekst">
 <Description>
 ====================================================================================================================</Description>
Index: vhUnitTest/APPS/PM/TestProductService.cls.xml
===================================================================
diff -u -r1681 -r1724
--- vhUnitTest/APPS/PM/TestProductService.cls.xml	(.../TestProductService.cls.xml)	(revision 1681)
+++ vhUnitTest/APPS/PM/TestProductService.cls.xml	(.../TestProductService.cls.xml)	(revision 1724)
@@ -134,6 +134,18 @@
 	Set ProductService =  ##class(APPS.PM.ProductService).%New()
 	Set ProductenLijst = ProductService.ZoekProducten(Criteria).HerkendeProducten
 	Do $$$AssertEquals(ProductenLijst.Count(),14,"Aantal gevonden producten met Classificatie "_Classificaties.GetAt(1)_" en "_Classificaties.GetAt(2)_" is correct.")
+	
+	
+	Set Classificaties = ##class(%ListOfDataTypes).%New()
+	Do Classificaties.Insert(183)
+
+	Set Criteria=##class(APPS.PM.dto.ZoekCriteria).%New()
+	Set Criteria.SoortProductID=##class(APPS.PM.enu.SoortProductID).ProductBoom()
+	
+	Set Criteria.Classificaties =  Classificaties
+	Set ProductService =  ##class(APPS.PM.ProductService).%New()
+	Set ProductenLijst = ProductService.ZoekProducten(Criteria).HerkendeProducten
+	Do $$$AssertEquals(ProductenLijst.Count(),511,"Aantal gevonden producten met Classificatie "_Classificaties.GetAt(1)_" is correct.")
 ]]></Implementation>
 </Method>
 
Index: DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml
===================================================================
diff -u -r1723 -r1724
--- DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml	(.../DataMGroepClassificatie.cls.xml)	(revision 1723)
+++ DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml	(.../DataMGroepClassificatie.cls.xml)	(revision 1724)
@@ -21,7 +21,10 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set Status = ##super(ClassificatieID)
-	Set ..SortSleutel = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_$E(100+$P(..DataKlas,"\",3),2,3)_$P(..DataKlas,"\",6)_" "
+	If ($$$ISOK(Status))
+	{
+		Set ..SortSleutel = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_$E(100+$P(..DataKlas,"\",3),2,3)_$P(..DataKlas,"\",6)_" "
+	}
 	Quit Status
 ]]></Implementation>
 </Method>
Index: DOM/PM/impl/DataM/DataMProductAPI.cls.xml
===================================================================
diff -u -r1723 -r1724
--- DOM/PM/impl/DataM/DataMProductAPI.cls.xml	(.../DataMProductAPI.cls.xml)	(revision 1723)
+++ DOM/PM/impl/DataM/DataMProductAPI.cls.xml	(.../DataMProductAPI.cls.xml)	(revision 1724)
@@ -98,19 +98,22 @@
 <ReturnType>DOM.PM.Classificatie</ReturnType>
 <Implementation><![CDATA[
 	Set Classificatie = ""
-	Set Niveau = $Piece(^KLAS("K",ClassificatieID),"\")
-	If (Niveau = ##class(DOM.PM.enu.PMClassificatieNiveau).Hoofdgroep())
+	If (ClassificatieID '= "")
 	{
-		Set Classificatie = ##class(DOM.PM.impl.DataM.DataMHoofdgroepClassificatie).%New(ClassificatieID)
+		Set Niveau = $Piece($Get(^KLAS("K",ClassificatieID)),"\")
+		If (Niveau = ##class(DOM.PM.enu.PMClassificatieNiveau).Hoofdgroep())
+		{
+			Set Classificatie = ##class(DOM.PM.impl.DataM.DataMHoofdgroepClassificatie).%New(ClassificatieID)
+		}
+		ElseIf (Niveau = ##class(DOM.PM.enu.PMClassificatieNiveau).Groep())
+		{
+			Set Classificatie = ##class(DOM.PM.impl.DataM.DataMGroepClassificatie).%New(ClassificatieID)
+		}
+		ElseIf (Niveau = ##class(DOM.PM.enu.PMClassificatieNiveau).Subgroep())
+		{
+			Set Classificatie = ##class(DOM.PM.impl.DataM.DataMSubgroepClassificatie).%New(ClassificatieID)
+		}
 	}
-	ElseIf (Niveau = ##class(DOM.PM.enu.PMClassificatieNiveau).Groep())
-	{
-		Set Classificatie = ##class(DOM.PM.impl.DataM.DataMGroepClassificatie).%New(ClassificatieID)
-	}
-	ElseIf (Niveau = ##class(DOM.PM.enu.PMClassificatieNiveau).Subgroep())
-	{
-		Set Classificatie = ##class(DOM.PM.impl.DataM.DataMSubgroepClassificatie).%New(ClassificatieID)
-	}
 	Quit Classificatie
 ]]></Implementation>
 </Method>
@@ -178,7 +181,7 @@
 
 <Method name="GeefOrgaluxProductIterator">
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.PM.impl.DataM.DataMHGProductIterator).%New("15OL ")
+<Implementation><![CDATA[	Quit ##class(DOM.PM.impl.DataM.DataMHGProductIterator).%New(837)
 ]]></Implementation>
 </Method>
 
Index: DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml
===================================================================
diff -u -r1723 -r1724
--- DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml	(.../DataMHoofdgroepClassificatie.cls.xml)	(revision 1723)
+++ DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml	(.../DataMHoofdgroepClassificatie.cls.xml)	(revision 1724)
@@ -21,7 +21,10 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set Status = ##super(ClassificatieID)
-	Set ..SortSleutel = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_" "
+	If ($$$ISOK(Status))
+	{
+		Set ..SortSleutel = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_" "
+	}
 	Quit Status
 ]]></Implementation>
 </Method>
Index: vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml
===================================================================
diff -u -r1723 -r1724
--- vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml	(.../TestClassificaties.cls.xml)	(revision 1723)
+++ vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml	(.../TestClassificaties.cls.xml)	(revision 1724)
@@ -24,6 +24,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestOnbestaand">
+<Implementation><![CDATA[
+	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+	Set Classificatie = ProductAPI.GeefClassificatie(-1)
+	Do $$$AssertFalse($IsObject(Classificatie),"Het object bestaat niet")
+]]></Implementation>
+</Method>
+
 <Method name="TestGroepenClassificatie">
 <Implementation><![CDATA[
 		Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
Index: DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml
===================================================================
diff -u -r1723 -r1724
--- DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml	(.../DataMSubgroepClassificatie.cls.xml)	(revision 1723)
+++ DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml	(.../DataMSubgroepClassificatie.cls.xml)	(revision 1724)
@@ -2,13 +2,29 @@
 <Export generator="Cache" version="9">
 <Class name="DOM.PM.impl.DataM.DataMSubgroepClassificatie">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>DOM.PM.impl.DataM.DataMClassificatie,DOM.PM.Classificatie</Super>
+<Super>DOM.PM.impl.DataM.DataMClassificatie,DOM.PM.SubgroepClassificatie</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="SortSleutel">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
+<Property name="SortSleutelIndex1">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SortSleutelIndex2">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SortSleutelIndex3">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Data">
 <Type>%String</Type>
 <Private>1</Private>
@@ -21,7 +37,13 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set Status = ##super(ClassificatieID)
-	Set ..SortSleutel = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_$E(100+$P(..DataKlas,"\",3),2,3)_$P(..DataKlas,"\",6)_$E(100+$P(..DataKlas,"\",4),2,3)_$P(..DataKlas,"\",7)_" "
+	If ($$$ISOK(Status))
+	{
+		Set ..SortSleutelIndex1 = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_" "
+		Set ..SortSleutelIndex2 = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_$E(100+$P(..DataKlas,"\",3),2,3)_$P(..DataKlas,"\",6)_" "
+		Set ..SortSleutelIndex3 = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_$E(100+$P(..DataKlas,"\",3),2,3)_$P(..DataKlas,"\",6)_$E(100+$P(..DataKlas,"\",4),2,3)_$P(..DataKlas,"\",7)_" "
+		Set ..SortSleutel = $E(100+$P(..DataKlas,"\",2),2,3)_$P(..DataKlas,"\",5)_$E(100+$P(..DataKlas,"\",3),2,3)_$P(..DataKlas,"\",6)_$E(100+$P(..DataKlas,"\",4),2,3)_$P(..DataKlas,"\",7)_" "
+	}
 	Quit Status
 ]]></Implementation>
 </Method>
@@ -50,6 +72,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefProductIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+	Set Lijst = ##class(%ListOfObjects).%New()
+	Set Korttekst = $Order(^KPH(..SortSleutelIndex1,..SortSleutelIndex2,..SortSleutelIndex3,"  ",""))
+	While (Korttekst '= "")
+	{
+		Set PRNr = ^KPH(..SortSleutelIndex1,..SortSleutelIndex2,..SortSleutelIndex3,"  ",Korttekst)
+		Do Lijst.Insert(ProductAPI.GeefProduct(PRNr))
+		Set Korttekst = $Order(^KPH(..SortSleutelIndex1,..SortSleutelIndex2,..SortSleutelIndex3,"  ",Korttekst))
+	}
+	Quit ##class(TECH.ListIterator).%New(Lijst)
+]]></Implementation>
+</Method>
+
 <Method name="DataGet">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: DOM/PM/impl/DataM/DataMClassificatie.cls.xml
===================================================================
diff -u -r1723 -r1724
--- DOM/PM/impl/DataM/DataMClassificatie.cls.xml	(.../DataMClassificatie.cls.xml)	(revision 1723)
+++ DOM/PM/impl/DataM/DataMClassificatie.cls.xml	(.../DataMClassificatie.cls.xml)	(revision 1724)
@@ -21,7 +21,12 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..ClassificatieID = ClassificatieID
-	Quit $$$OK
+	Set Status = $$$OK
+	If ('$Data(^KLAS("K",..ClassificatieID)))
+	{
+		Set Status = $$$ERROR($$$GeneralError,"Classificatie bestaat niet")
+	}
+	Quit Status
 ]]></Implementation>
 </Method>
 
@@ -47,9 +52,8 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Key="K"
 	If (i%DataKlas = "") {
-		Set i%DataKlas = ^KLAS(Key,..ClassificatieID)
+		Set i%DataKlas = ^KLAS("K",..ClassificatieID)
 	}
 	Quit i%DataKlas
 ]]></Implementation>
Index: DOM/PM/impl/DataM/DataMHGProductIterator.cls.xml
===================================================================
diff -u -r1075 -r1724
--- DOM/PM/impl/DataM/DataMHGProductIterator.cls.xml	(.../DataMHGProductIterator.cls.xml)	(revision 1075)
+++ DOM/PM/impl/DataM/DataMHGProductIterator.cls.xml	(.../DataMHGProductIterator.cls.xml)	(revision 1724)
@@ -36,12 +36,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Hoofdgroep:%String</FormalSpec>
+<FormalSpec>HoofdgroepClassificatieID:%String</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..Hoofdgroep = Hoofdgroep
+	Set DataKlas = ^KLAS("K",HoofdgroepClassificatieID)
+	Set ..Hoofdgroep = $E(100+$P(DataKlas,"\",2),2,3)_$P(DataKlas,"\",5)_" "
 	Set ..Key1 = $Order(^KPH(..Hoofdgroep,""))
 	Set ..Key2 = $Order(^KPH(..Hoofdgroep,..Key1,""))
 	Set ..Key3 = $Order(^KPH(..Hoofdgroep,..Key1,..Key2,""))