Index: BL/Sys/FOP/DataMgr.cls.xml
===================================================================
diff -u -r54974 -r55181
--- BL/Sys/FOP/DataMgr.cls.xml	(.../DataMgr.cls.xml)	(revision 54974)
+++ BL/Sys/FOP/DataMgr.cls.xml	(.../DataMgr.cls.xml)	(revision 55181)
@@ -58,6 +58,23 @@
 <Type>%Status</Type>
 </Property>
 
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Instantiate">
 <Description>
 Set blFOPData=##class(BL.Sys.FOP.DataMgr).Instantiate(...) </Description>
@@ -394,8 +411,7 @@
 <ReturnType>TECH.ResultSet</ReturnType>
 <Implementation><![CDATA[
 	#dim SqlStatement As TECH.String = "SELECT ID  FROM Sys_FOP.TaskQueue  WHERE (Status = 'E') AND (RunMode = 'B') AND (Task->ActionPrint_Printer = ? ) " 
-	#dim QueryAPI As TECH.Query.QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
-	#dim ResultSet As TECH.ResultSet = QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement, $LB(PrinterNaam) ))
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement, $LB(PrinterNaam) ))
 	
 	Quit ResultSet
 ]]></Implementation>
@@ -410,8 +426,8 @@
 	#dim Status As %Status = $$$OK
 
 	#dim SqlStatement As TECH.String = "UPDATE Sys_FOP.TaskQueue  SET Status='W'  WHERE (Status = 'E') AND (RunMode = 'B') AND (Task->ActionPrint_Printer = ? ) " 
-	#dim QueryAPI As TECH.Query.QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
-	#dim ResultSet As TECH.ResultSet = QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement, $LB(PrinterNaam) ))
+	
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement, $LB(PrinterNaam) ))
 	Do ResultSet.Next(.Status)
 	
 	Quit Status