Index: AXimpl/Admin/DOM/PM/ProductIteratorFilter.cls.xml
===================================================================
diff -u -r44555 -r47482
--- AXimpl/Admin/DOM/PM/ProductIteratorFilter.cls.xml	(.../ProductIteratorFilter.cls.xml)	(revision 44555)
+++ AXimpl/Admin/DOM/PM/ProductIteratorFilter.cls.xml	(.../ProductIteratorFilter.cls.xml)	(revision 47482)
@@ -3,6 +3,11 @@
 <Class name="AXimpl.Admin.DOM.PM.ProductIteratorFilter">
 <Super>TECH.RegisteredObject,TECH.Filter</Super>
 
+<Property name="ServiceProductFilter">
+<Type>AX.Uitgaand.PM.impl.IsServiceProductFilter</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="SoprIteratorFilter">
 <Type>AX.Uitgaand.PM.impl.SoprIteratorFilter</Type>
 <Private>1</Private>
@@ -14,6 +19,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..ServiceProductFilter = ##class(AX.Uitgaand.PM.impl.IsServiceProductFilter).%New()
 	Set ..SoprIteratorFilter = ##class(AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -26,10 +32,12 @@
 	#dim IsValid As %Boolean = $$$True
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(Item.GetData(1))
 	
-	If ('..SoprIteratorFilter.IsValid(Product)) {
+	If $$$Not(..SoprIteratorFilter.IsValid(Product)) {
 		Set IsValid = $$$False
 	} ElseIf (##class(TECH.StringUtils).Equals(Product.Basis.LinkType,"S","HZ","HHZ")) {
 		Set IsValid = $$$False
+	} ElseIf (..ServiceProductFilter.IsValid(Product)) {
+		Set IsValid = $$$False
 	}
 	
 	Quit IsValid