diff --git a/cmsmap/lib/jooscan.py b/cmsmap/lib/jooscan.py
index 694348a..e17320d 100644
--- a/cmsmap/lib/jooscan.py
+++ b/cmsmap/lib/jooscan.py
@@ -18,7 +18,7 @@ class JooScan:
     def __init__(self):
         self.url = None
         self.usernames = []
-        self.pluginPath = "?option="
+        self.pluginPath = "/?option="
         self.pluginsFound = []
         self.notValidLen = []
         self.notExistingCode = 404
diff --git a/cmsmap/lib/threadscanner.py b/cmsmap/lib/threadscanner.py
index 5863c98..ff079eb 100644
--- a/cmsmap/lib/threadscanner.py
+++ b/cmsmap/lib/threadscanner.py
@@ -26,7 +26,9 @@ def __init__(self, url, pluginPath, pluginPathEnd, pluginsFound, notExistingCode
     def run(self):
         while True:
             # Get plugin from plugin queue
-            plugin = self.q.get()
+            plugin = urllib.parse.quote(self.q.get())
+
+
             requester.request(self.url + self.pluginPath + plugin + self.pluginPathEnd, data=None)
             if requester.status_code == 200 and len(requester.htmltext) not in self.notValidLen:
                 self.pluginsFound.append(plugin)