diff --git a/core/src/main/java/org/restheart/handlers/RequestLogger.java b/core/src/main/java/org/restheart/handlers/RequestLogger.java
index 7e096a9ae..7c25b7b0e 100644
--- a/core/src/main/java/org/restheart/handlers/RequestLogger.java
+++ b/core/src/main/java/org/restheart/handlers/RequestLogger.java
@@ -32,7 +32,6 @@
 import org.restheart.exchange.ByteArrayProxyResponse;
 import org.restheart.exchange.JsonProxyRequest;
 import static org.restheart.plugins.security.TokenManager.AUTH_TOKEN_HEADER;
-import org.restheart.utils.URLUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -110,7 +109,7 @@ protected void dumpExchange(HttpServerExchange exchange, Integer logLevel) {
             sb.append(exchange.getRequestMethod()).append(" ").append(exchange.getRequestURL());
 
             if (exchange.getQueryString() != null && !exchange.getQueryString().isEmpty()) {
-                sb.append("?").append(URLUtils.decodeQueryString(exchange));
+                sb.append("?").append(exchange.getQueryString());
             }
 
             sb.append(" from ").append(exchange.getSourceAddress());
@@ -244,7 +243,7 @@ private void addExchangeCompleteListener(HttpServerExchange exchange, Integer lo
                                 sb.append("          account=").append(sc.getAuthenticatedAccount().toString())
                                         .append("\n");
                             } else {
-                                sb.append("          authType=none" + "\n");
+                                sb.append("          authType=none").append("\n");
                             }
                         }
 
diff --git a/mongodb/src/main/java/org/restheart/mongodb/handlers/changestreams/ChangeStreamWorkerKey.java b/mongodb/src/main/java/org/restheart/mongodb/handlers/changestreams/ChangeStreamWorkerKey.java
index 2436ef3f7..5166a797d 100644
--- a/mongodb/src/main/java/org/restheart/mongodb/handlers/changestreams/ChangeStreamWorkerKey.java
+++ b/mongodb/src/main/java/org/restheart/mongodb/handlers/changestreams/ChangeStreamWorkerKey.java
@@ -20,7 +20,6 @@
  */
 package org.restheart.mongodb.handlers.changestreams;
 
-import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
@@ -28,6 +27,7 @@
 import org.bson.BsonDocument;
 import org.bson.json.JsonMode;
 import org.restheart.utils.BsonUtils;
+import org.restheart.utils.URLUtils;
 
 import io.undertow.server.HttpServerExchange;
 import io.undertow.websockets.spi.WebSocketHttpExchange;
@@ -86,13 +86,13 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        var _url = this.url == null ? null : URLDecoder.decode(this.url, StandardCharsets.UTF_8);
+        var _url = this.url == null ? null : URLUtils.decodeQueryString(this.url);
 
         return "ChangeStreamWorkerKey{url: " + _url + ", avars: " + BsonUtils.toJson(this.avars) + ", jsonMode: " + this.jsonMode + "}";
     }
 
     private static String encode(String queryString) {
-        return URLEncoder.encode(URLDecoder.decode(queryString, StandardCharsets.UTF_8), StandardCharsets.UTF_8);
+        return URLEncoder.encode(URLUtils.decodeQueryString(queryString), StandardCharsets.UTF_8);
     }
 
     /**