Index: BL/Legacy/EWORDS/PickingOpdrachtInfoIterator/Filter/OrgaluxFilter.cls.xml
===================================================================
diff -u -r48118 -r55454
--- BL/Legacy/EWORDS/PickingOpdrachtInfoIterator/Filter/OrgaluxFilter.cls.xml	(.../OrgaluxFilter.cls.xml)	(revision 48118)
+++ BL/Legacy/EWORDS/PickingOpdrachtInfoIterator/Filter/OrgaluxFilter.cls.xml	(.../OrgaluxFilter.cls.xml)	(revision 55454)
@@ -24,7 +24,7 @@
 <Method name="IsValid">
 <FormalSpec>Value:%CacheString</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..IsOrgalux(Value)
+<Implementation><![CDATA[	Quit (..IsOrgalux(Value) || ..IsTAORIndelingProduct(Value))
 ]]></Implementation>
 </Method>
 
@@ -35,6 +35,14 @@
 <Implementation><![CDATA[	Quit ..ProductTypeApi.IsOrgaluxProduct(PickingOpdrachtInfo.GeefProductNummer())
 ]]></Implementation>
 </Method>
+
+<Method name="IsTAORIndelingProduct">
+<FormalSpec>PickingOpdrachtInfo:BL.Legacy.EWORDS.PickingOpdrachtInfo</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..ProductTypeApi.IsTAORIndelingProduct(PickingOpdrachtInfo.GeefProductNummer())
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: BL/Legacy/EWORDS/PickingOpdrachtInfoIterator/Filter/NietOrgaluxFilter.cls.xml
===================================================================
diff -u -r48118 -r55454
--- BL/Legacy/EWORDS/PickingOpdrachtInfoIterator/Filter/NietOrgaluxFilter.cls.xml	(.../NietOrgaluxFilter.cls.xml)	(revision 48118)
+++ BL/Legacy/EWORDS/PickingOpdrachtInfoIterator/Filter/NietOrgaluxFilter.cls.xml	(.../NietOrgaluxFilter.cls.xml)	(revision 55454)
@@ -24,7 +24,7 @@
 <Method name="IsValid">
 <FormalSpec>Value:%CacheString</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..IsNietOrgalux(Value)
+<Implementation><![CDATA[	Quit (..IsNietOrgalux(Value) && ..IsNietTAORIndelingProduct(Value))
 ]]></Implementation>
 </Method>
 
@@ -35,6 +35,14 @@
 <Implementation><![CDATA[	Quit $$$Not(..ProductTypeApi.IsOrgaluxProduct(PickingOpdrachtInfo.GeefProductNummer()))
 ]]></Implementation>
 </Method>
+
+<Method name="IsNietTAORIndelingProduct">
+<FormalSpec>PickingOpdrachtInfo:BL.Legacy.EWORDS.PickingOpdrachtInfo</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$Not(..ProductTypeApi.IsTAORIndelingProduct(PickingOpdrachtInfo.GeefProductNummer()))
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: EWORDS6.mac.rou
===================================================================
diff -u -r55378 -r55454
--- EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 55378)
+++ EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 55454)
@@ -16,7 +16,7 @@
 SendWMS(ORDNr)
 	New %J,I,R,PRNr,Aantal,OLUNr,LeverDag,VerzDat,DOutDate,DOutTime,VerzW,VerzZ,LevAdr,ChkBeletDone,ORDNrs,CumulORDNr,WaitORDNrs
 	New LandCode,PostCode
-	New PickingDag, KlantNummer, Filters, FilterIterator, IsVoorVandaag, ConsolidatieNummer
+	New PickingDag, KlantNummer, FilterIterator, IsVoorVandaag, ConsolidatieNummer
 	New OrderApi, OrderLijn, OrderLijnIterator
 	New PickingOpdrachtInfo, PickingOpdrachtInfoIterator, PickingOpdrachtInfoLijst
 	New IsKlantOnderRembours, OrderPickingOpdrachtInfoLijst, OrderLijnCount, PickingVoorVandaagOrderLijnCount, IsOrderVolledigPickingVoorVandaag
@@ -76,12 +76,8 @@
 		 	}
 		}
 		
-		#dim Filters As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
-		Do Filters.Insert(##class(BL.Legacy.EWORDS.PickingOpdrachtInfoIterator.Filter.OrgaluxFilter).%New())
-		Do Filters.Insert(##class(BL.Legacy.EWORDS.PickingOpdrachtInfoIterator.Filter.NietOrgaluxFilter).%New())
-		
 		#dim IsVoorVandaag As %Boolean = (PickingDag = ##class(BL.Legacy.EWORDS6.enu.PickingDag).Vandaag())
-		#dim FilterIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Filters)
+		#dim FilterIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(##class(BL.Legacy.EWORDS.Save).GeefFilters())
 		
 		Set %J = $$%J^vhRtn1()
 	 	Kill ^HULP(%J)