Index: APPS/PM/Kenmerk/impl/KenmerkenService.cls.xml
===================================================================
diff -u -r31549 -r33057
--- APPS/PM/Kenmerk/impl/KenmerkenService.cls.xml	(.../KenmerkenService.cls.xml)	(revision 31549)
+++ APPS/PM/Kenmerk/impl/KenmerkenService.cls.xml	(.../KenmerkenService.cls.xml)	(revision 33057)
@@ -182,6 +182,7 @@
 <ReturnType>APPS.PM.dto.Kenm.KenmerkMetadataList</ReturnType>
 <Implementation><![CDATA[
 	Set MetadataGroep = ##class(APPS.PM.dto.Kenm.KenmerkMetadataList).%New()	
+	#dim QueryAPI As TECH.Query.QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
 	
 	;$$$TECHErrorTrapOn
 	Try {	
@@ -215,8 +216,7 @@
 					set KenmerkGroepMetadata.GeneratieTypeIsRelevant = MetaGroep.GeneratieTypeIsRelevant
 				}
 			
-				Set RS = ##class(%ResultSet).%New("Prod.Kenmerk.MetaDefinitie:FilterMetaDefsViaGroep")
-				Do RS.Execute(KenmerkGroep)
+				#dim RS As TECH.ResultSet = QueryAPI.GetResultSet(##class(TECH.ClassQuery).%New("Prod.Kenmerk.MetaDefinitie","FilterMetaDefsViaGroep",$LB(KenmerkGroep)))
 				While (RS.Next()){	
 				 
 					Set KenmerkMetadata = ##class(APPS.PM.dto.Kenm.KenmerkMetadata).%New()