diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/Request.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/Request.java
index 47ec0edd7..3563e57aa 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/Request.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/Request.java
@@ -28,7 +28,7 @@ public class Request {
 
     public Request(HttpExchange exchange, Locale locale) {
         this.requestMethod = exchange.getRequestMethod();
-        this.target = exchange.getRequestURI().toString();
+        this.target = exchange.getRequestURI().getPath();
 
         remoteAddress = exchange.getRemoteAddress().getAddress().getHostAddress();
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/ServerPageHandler.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/ServerPageHandler.java
index 1fcf33f02..ce40973d8 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/ServerPageHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/ServerPageHandler.java
@@ -96,7 +96,7 @@ public class ServerPageHandler implements PageHandler {
 
         if (!target.isEmpty()) {
             try {
-                String serverName = target.get(0).replace("%20", " ");
+                String serverName = target.get(0);
                 Optional<UUID> serverUUIDOptional = dbSystem.getDatabase().fetch().getServerUUID(serverName);
                 if (serverUUIDOptional.isPresent()) {
                     serverUUID = serverUUIDOptional.get();