Index: TECH/Net/URI.cls.xml
===================================================================
diff -u -r335 -r346
--- TECH/Net/URI.cls.xml	(.../URI.cls.xml)	(revision 335)
+++ TECH/Net/URI.cls.xml	(.../URI.cls.xml)	(revision 346)
@@ -58,6 +58,9 @@
 </Method>
 
 <Method name="VoegToeQueryElement">
+<Description>
+N.B. Naam en Waarde moeten unescaped doorgegeven worden. 
+Deze method doet de eventueel nodige escaping van bvb "+" naar "%2B".</Description>
 <FormalSpec>Naam:%String,Waarde:%String</FormalSpec>
 <Implementation><![CDATA[
 		If ("" = ..Query) {
@@ -68,10 +71,17 @@
 			Set ..Query = ..Query _ "&"
 		}
 		
-		Set ..Query = ..Query _ Naam _ "=" _ Waarde
+		Set ..Query = ..Query _ ..EscapeQueryElement(Naam) _ "=" _ ..EscapeQueryElement(Waarde)
 ]]></Implementation>
 </Method>
 
+<Method name="EscapeQueryElement">
+<FormalSpec>NonEscapedElement:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $ZCONVERT(NonEscapedElement, "O", "URL")
+]]></Implementation>
+</Method>
+
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[