Index: TECH/Filter/PropertyBasedFilter.cls.xml
===================================================================
diff -u -r2580 -r2581
--- TECH/Filter/PropertyBasedFilter.cls.xml	(.../PropertyBasedFilter.cls.xml)	(revision 2580)
+++ TECH/Filter/PropertyBasedFilter.cls.xml	(.../PropertyBasedFilter.cls.xml)	(revision 2581)
@@ -3,19 +3,25 @@
 <Class name="TECH.Filter.PropertyBasedFilter">
 <Super>TECH.RegisteredObject,TECH.Filter</Super>
 
+<Property name="KeyValuePairList">
+<Type>TECH.KeyValue.List</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="KeyValuePairIterator">
 <Type>TECH.Iterator</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>KeyValuePairList:TECH.KeyValue.UniqueList</FormalSpec>
+<FormalSpec>KeyValuePairList:TECH.KeyValue.List</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..KeyValuePairIterator = ##class(TECH.ListIterator).%New(KeyValuePairList)
+	Set ..KeyValuePairList = KeyValuePairList
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -27,8 +33,9 @@
 	#dim IsValid As %Boolean = 1
 	while ( ..KeyValuePairIterator.HasNext() ) && ( IsValid ) {
 		#dim KeyValuePair As TECH.KeyValuePair = ..KeyValuePairIterator.Next()
-		set IsValid = $property(Object,KeyValuePair.Key)=KeyValuePair.Value
+		set IsValid = ..KeyValuePairList.ValueExistsForKey(KeyValuePair.Key, $property(Object,KeyValuePair.Key))
 	}
+	Do ..KeyValuePairIterator.Reset()
 	quit IsValid
 ]]></Implementation>
 </Method>
Index: TECH/KeyValue/List.cls.xml
===================================================================
diff -u -r1785 -r2581
--- TECH/KeyValue/List.cls.xml	(.../List.cls.xml)	(revision 1785)
+++ TECH/KeyValue/List.cls.xml	(.../List.cls.xml)	(revision 2581)
@@ -22,6 +22,42 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GetValuesForKey">
+<FormalSpec>Key:%String</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	#Dim Keys As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#Dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New($this)
+	#Dim NextKey As %String
+	
+	While (ListIterator.HasNext()) {
+		Set NextKey = ListIterator.Next()
+		Do:NextKey.Key=Key Keys.Insert(NextKey.Value)
+	}
+	
+	Quit Keys
+]]></Implementation>
+</Method>
+
+<Method name="ValueExistsForKey">
+<FormalSpec>Key:%String,Value:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#Dim Values As %ListOfDataTypes = ..GetValuesForKey(Key)
+	#Dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(Values)
+	
+	#dim Gevonden As %Boolean = $$$False
+	#dim NextValue As %String
+	While (ListIterator.HasNext()) && 'Gevonden {
+		Set NextValue = ListIterator.Next()
+		If NextValue = Value {
+			Set Gevonden = $$$True
+		}
+	}
+	Quit Gevonden
+]]></Implementation>
+</Method>
+
 <Storage name="Custom">
 <Type>%Library.CompleteCustomStorage</Type>
 </Storage>