diff --git a/WebApiTestClient/WebApiTestClient/Scripts/WebApiTestClient.js b/WebApiTestClient/WebApiTestClient/Scripts/WebApiTestClient.js
index 5843dec..707aea6 100644
--- a/WebApiTestClient/WebApiTestClient/Scripts/WebApiTestClient.js
+++ b/WebApiTestClient/WebApiTestClient/Scripts/WebApiTestClient.js
@@ -47,6 +47,13 @@ var emptyTestClientModel =
         var queryParameter = parameterToRemove + '=' + urlParameter;
         path = path.replace(queryParameter, "");
         path = path.replace(urlParameter, "");
+
+        path = path.replace("/?", "?");
+        path = path.replace("?&", "?");
+        path = path.replace("&&", "&");
+        if (path.charAt(path.length - 1) == '&') {
+            path = path.substr(0, path.length - 1);
+        }
         return path;
     }
 
@@ -252,4 +259,4 @@ function getHttpResponse(httpRequest) {
     var responseStatus = statusCode + "/" + statusText;
 
     return { status: responseStatus, headers: responseHeaders, content: rawResponse };
-}
\ No newline at end of file
+}