diff --git a/src/main/java/com/eactive/testmaster/client/service/ApiClientFactory.java b/src/main/java/com/eactive/testmaster/client/service/ApiClientFactory.java
index 886ee2a..c0ce655 100644
--- a/src/main/java/com/eactive/testmaster/client/service/ApiClientFactory.java
+++ b/src/main/java/com/eactive/testmaster/client/service/ApiClientFactory.java
@@ -17,6 +17,7 @@ public class ApiClientFactory {
     public ApiClient getClient(ApiRequestDTO request) {
         switch (request.getType().toUpperCase()) {
             case "HTTP":
+            case "HTTPFLAT":
                 return httpApiClient;
             case "TCP":
                 return tcpApiClient;
diff --git a/src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java b/src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java
index 33a2460..2fe43ef 100644
--- a/src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java
+++ b/src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java
@@ -72,6 +72,7 @@ public class NettyHttpApiClient implements ApiClient {
                         ch.pipeline().addLast(new HttpClientCodec());
                         ch.pipeline().addLast(new HttpObjectAggregator(65536));
                         ch.pipeline().addLast(new HttpContentDecompressor());
+                        ch.pipeline().addLast(new HttpRequestLoggerHandler()); // Add custom HttpRequestLoggerHandler
                         ch.pipeline().addLast(new HttpHandler(responseFuture));
                     }
                 });
@@ -92,8 +93,7 @@ public class NettyHttpApiClient implements ApiClient {
             if (queryIndex != -1) {
                 String path = fullPath.substring(0, queryIndex);
                 String queryParams = fullPath.substring(queryIndex + 1);
-                String encodedQueryParams = URLEncoder.encode(queryParams);
-                encodedPath = path + "?" + encodedQueryParams;
+                encodedPath = path + "?" + queryParams;
             }
 
             HttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.valueOf(apiRequest.getMethod()), encodedPath, content);