diff --git a/src/views/UrlQueryViewer.vue b/src/views/UrlQueryViewer.vue
index 4420e77..500580d 100644
--- a/src/views/UrlQueryViewer.vue
+++ b/src/views/UrlQueryViewer.vue
@@ -56,16 +56,11 @@ export default {
         return;
       }
 
-      const urlParams = new URLSearchParams(this.toolData.data);
+      const url = new URL(this.toolData.data);
 
       // Parse query
       const queryParams = [];
-      for (let [key, value] of urlParams) {
-        // Fix first param starts with main url part
-        if (key.indexOf('?') !== -1) {
-          key = key.split('?')[1];
-        }
-
+      for (let [key, value] of url.searchParams.entries()) {
         queryParams.push({
           key: key,
           value: value,