Index: WSimpl/AX/CalculatedProduct/AfbeeldingService.cls.xml
===================================================================
diff -u -r48342 -r49414
--- WSimpl/AX/CalculatedProduct/AfbeeldingService.cls.xml	(.../AfbeeldingService.cls.xml)	(revision 48342)
+++ WSimpl/AX/CalculatedProduct/AfbeeldingService.cls.xml	(.../AfbeeldingService.cls.xml)	(revision 49414)
@@ -9,7 +9,7 @@
 <Implementation><![CDATA[
 	#dim ImageLink As BL.Prod.ImageLink = ##class(BL.Prod.ImageLink).%New()
 	
-	Quit ImageLink.GetProductImageURL(Product.GeefID(), ##class(APPS.common.enu.Toepassing).Print())
+	Quit ImageLink.GetProductImageURL(Product.GeefID(), ##class(APPS.common.enu.Toepassing).Print(),,,,,, "JPG")
 ]]></Implementation>
 </Method>
 </Class>
Index: BL/Prod/ImageLink.cls.xml
===================================================================
diff -u -r48220 -r49414
--- BL/Prod/ImageLink.cls.xml	(.../ImageLink.cls.xml)	(revision 48220)
+++ BL/Prod/ImageLink.cls.xml	(.../ImageLink.cls.xml)	(revision 49414)
@@ -452,14 +452,14 @@
 Toepassing : FLEX, WEB, FOPLINK, FOPEMBED, LABEL, PRINT, FILE
 FormatPref : De toepassing default de FormatPreferenties $LB("SVG";"JPG")
 <BR>Extra Parameter ImgInfo (bevat de ImageLinkID's en de URL)]]></Description>
-<FormalSpec><![CDATA[PRNr:%Integer,Toepassing:APPS.common.enu.Toepassing,FunctieType:%String="PB",Pref:%List,Dummy:%List,Taal:%String="",&ImgInfo]]></FormalSpec>
+<FormalSpec><![CDATA[PRNr:%Integer,Toepassing:APPS.common.enu.Toepassing,FunctieType:%String="PB",Pref:%List,Dummy:%List,Taal:%String="",&ImgInfo,Extension:%String=""]]></FormalSpec>
 <Implementation><![CDATA[
 	#dim ObjRef As %String = ""
 	#dim ObjType As %String = ""
 	#dim URL As %String = ""
 	Do ..GetRefs(PRNr,"E",.ObjType,.ObjRef)
 	If ObjRef '= "" {
-    	Set URL = ..GetImageURL(ObjType,ObjRef,.Toepassing,.FunctieType,.Pref,.Taal,.ImgInfo)
+    	Set URL = ..GetImageURL(ObjType,ObjRef,.Toepassing,.FunctieType,.Pref,.Taal,.ImgInfo, Extension)
 	}
     Quit URL
 ]]></Implementation>
@@ -470,9 +470,10 @@
 Toepassing : FLEX, VHINTRASHELL, WEB, FOPLINK, FOPEMBED, LABEL, PRINT, FILE, WMS, MAKOVA
 FormatPref : De toepassing default de FormatPreferenties $LB("SVG";"JPG")
 w ##class(BL.Prod.ImageLink).%New().GetImageURL("TBX","DZ_ER","MAKOVA")</Description>
-<FormalSpec><![CDATA[ObjType:%String,ObjRef:%String,Toepassing:APPS.common.enu.Toepassing,FunctieType:%String="PB",Pref:%List,Taal:%String="",&ImgInfo:%String]]></FormalSpec>
+<FormalSpec><![CDATA[ObjType:%String,ObjRef:%String,Toepassing:APPS.common.enu.Toepassing,FunctieType:%String="PB",Pref:%List,Taal:%String="",&ImgInfo:%String,Extension:%String=""]]></FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	//Do ##class(Tools.Wlip).%New(42).String("getimageurl:" _ ObjType)
 	Set:($Get(Pref) = "") Pref = ..DefaultPrefs(Toepassing)	
 	Set ImgInfo("ObjRef") = ObjRef
 	Set ImgInfo("ObjType") = ObjType
@@ -495,10 +496,17 @@
 		  " (ImageLink->ObjRef = ? ) AND"_
 		  " (ImageLink->FunctieType = ?) AND"_
 		  " ((ImageLink->Taal = ?) OR (ImageLink->Taal IS NULL))"
-		
-	#dim SelectMin As %Integer = 99999  
-	#dim ResultSet As TECH.ResultSet = $$ExecDynQuery^vhLib.Query(Query, $ListBuild(ObjType, ObjRef, FunctieType, Taal))
 	
+	#dim SelectMin As %Integer = 99999  	  
+	#dim ResultSet As TECH.ResultSet
+		  
+	If $$$Not(Extension = "") {
+		Set Query = Query _ " AND (Links_Extensie = ?)"
+		Set ResultSet = $$ExecDynQuery^vhLib.Query(Query, $ListBuild(ObjType, ObjRef, FunctieType, Taal, "JPG"))
+	} Else {
+		Set ResultSet = $$ExecDynQuery^vhLib.Query(Query, $ListBuild(ObjType, ObjRef, FunctieType, Taal))
+	}
+	
 	While (ResultSet.Next()) {
 		#dim VisueelType As %String = ResultSet.Data("VisueelType")
 		#dim PositieVisueelType As %Integer = $ListFind(Pref, ResultSet.Data("VisueelType"))