Index: AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml
===================================================================
diff -u -r40720 -r40726
--- AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 40720)
+++ AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 40726)
@@ -38,13 +38,13 @@
 <Method name="VoerUitQuery">
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName("Prod.Product")
-	#dim SqlTableName2 As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName("Prod.ProductTekst")
+	#dim SqlTableProdProduct As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName("Prod.Product")
+	#dim SqlTableProdProductTekst As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName("Prod.ProductTekst")
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT a.IdentNummer, a.OmschrijvingN1, a.OmschrijvingN2, b.OmschrijvingN3, b.OmschrijvingN4, b.OmschrijvingN5, KortTekst FROM "
-		_SqlTableName_" a, "_SqlTableName2_" b WHERE a.ProductNr = b.ProductNr AND a.ID IN ('1432225','1432226','1425096','1425095','682391','1359867','1168696','1168689','830507','1155640','161442'"
-		_",'906194','709825','924268','1124771','1038806','1039173','1039208','1247980','353741','353743','353744','254245','254258','1259381'"
-		_",'161441','665626','1067709','1067714','268026','1168369','668615','878186','878220','1169509','1194443','383880','830257')"
+	Set SqlStatement = "SELECT ProdProduct.IdentNummer, ProdProduct.OmschrijvingN1, ProdProduct.OmschrijvingN2, ProdProductTekst.OmschrijvingN3,"
+		_" ProdProductTekst.OmschrijvingN4, ProdProductTekst.OmschrijvingN5, KortTekst FROM "_SqlTableProdProduct_" ProdProduct, "
+		_SqlTableProdProductTekst_" ProdProductTekst WHERE ProdProduct.ProductNr = ProdProductTekst.ProductNr AND "
+		_"isnull(ProdProduct.Gentype,'')='' and korttekst not like 'GEN%'"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
Index: vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductIterator/Test.cls.xml
===================================================================
diff -u -r40722 -r40726
--- vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 40722)
+++ vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 40726)
@@ -7,11 +7,10 @@
 <Implementation><![CDATA[
 	Try {
 		#dim Statement as %String 
-		Set Statement = "SELECT a.IdentNummer, a.OmschrijvingN1, a.OmschrijvingN2, b.OmschrijvingN3, b.OmschrijvingN4, b.OmschrijvingN5, "
-			_"KortTekst FROM Prod.Product a, Prod.ProductTekst b WHERE a.ProductNr = b.ProductNr AND a.ID IN ('1432225','1432226'"
-			_",'1425096','1425095','682391','1359867','1168696','1168689','830507','1155640','161442','906194','709825','924268','1124771'"
-			_",'1038806','1039173','1039208','1247980','353741','353743','353744','254245','254258','1259381','161441','665626','1067709'"
-			_",'1067714','268026','1168369','668615','878186','878220','1169509','1194443','383880','830257')" 
+		Set Statement = "SELECT ProdProduct.IdentNummer, ProdProduct.OmschrijvingN1, ProdProduct.OmschrijvingN2, ProdProductTekst.OmschrijvingN3,"
+			_" ProdProductTekst.OmschrijvingN4, ProdProductTekst.OmschrijvingN5, KortTekst FROM Prod.Product ProdProduct, "
+			_"Prod.ProductTekst ProdProductTekst WHERE ProdProduct.ProductNr = ProdProductTekst.ProductNr AND "
+			_"isnull(ProdProduct.Gentype,'')='' and korttekst not like 'GEN%'" 
 		#dim ResultSet As TECH.ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(
 			##class(TECH.ListUtils).CreateListOfDataTypes("1.234.567.8"), 
 			##class(TECH.ListUtils).CreateListOfDataTypes("IdentNummer"))