diff --git a/DIST/RestServices_mx7_4.2.3.mpk b/DIST/RestServices_mx7_4.2.3.mpk
new file mode 100644
index 0000000..c7530d6
Binary files /dev/null and b/DIST/RestServices_mx7_4.2.3.mpk differ
diff --git a/RestServices.mpr b/RestServices.mpr
index 7f0cbb6..44f7b7e 100644
Binary files a/RestServices.mpr and b/RestServices.mpr differ
diff --git a/javasource/restservices/RestServices.java b/javasource/restservices/RestServices.java
index e0a5dd5..d922e41 100644
--- a/javasource/restservices/RestServices.java
+++ b/javasource/restservices/RestServices.java
@@ -20,7 +20,7 @@ public class RestServices {
 	/**
 	 * Version of the RestServices module
 	 */
-	public static final String VERSION = "4.2.2";
+	public static final String VERSION = "4.2.3";
 
 	/**
 	 * Amount of objects that are processed by the module at the same time.
diff --git a/javasource/restservices/util/Utils.java b/javasource/restservices/util/Utils.java
index 90ee823..caae6db 100644
--- a/javasource/restservices/util/Utils.java
+++ b/javasource/restservices/util/Utils.java
@@ -27,6 +27,8 @@
 import com.mendix.systemwideinterfaces.core.meta.IMetaPrimitive;
 import com.mendix.systemwideinterfaces.core.meta.IMetaPrimitive.PrimitiveType;
 
+import org.owasp.encoder.Encode;
+
 public class Utils {
 
 	public static String getShortMemberName(String memberName) {
@@ -179,7 +181,8 @@ public static String nullToEmpty(String statusText) {
 	}
 
 	public static String getRequestUrl(HttpServletRequest request) {
-		return request.getRequestURL().toString() + (Utils.isEmpty(request.getQueryString()) ? "" : "?" + request.getQueryString());
+		String queryString = Encode.forUriComponent(request.getQueryString());
+		return request.getRequestURL().toString() + (Utils.isEmpty(queryString) ? "" : "?" + queryString);
 	}
 
 	public static boolean isSystemAttribute(String key) {
diff --git a/userlib/encoder-1.2.1.jar b/userlib/encoder-1.2.1.jar
new file mode 100644
index 0000000..f0404c8
Binary files /dev/null and b/userlib/encoder-1.2.1.jar differ
diff --git a/userlib/encoder-1.2.1.jar.RestServices.RequiredLib b/userlib/encoder-1.2.1.jar.RestServices.RequiredLib
new file mode 100644
index 0000000..e69de29