diff --git a/src/components/appNavigationController.ts b/src/components/appNavigationController.ts
index 35a74495..5fdf1132 100644
--- a/src/components/appNavigationController.ts
+++ b/src/components/appNavigationController.ts
@@ -237,7 +237,7 @@ export class AppNavigationController {
   public replaceState() {
     this.debug && this.log.warn('replace');
 
-    const url = location.origin + location.pathname + this.overriddenHash;
+    const url = location.origin + location.pathname + location.search + this.overriddenHash;
     history.replaceState(this.id, '', url);
   }
 
diff --git a/src/helpers/setWorkerProxy.ts b/src/helpers/setWorkerProxy.ts
index 83ad857a..b8cef5a0 100644
--- a/src/helpers/setWorkerProxy.ts
+++ b/src/helpers/setWorkerProxy.ts
@@ -15,8 +15,13 @@ export default function setWorkerProxy() {
     }
   };
 
-  const workerProxy = new Proxy(Worker, workerHandler);
-  Worker = workerProxy;
+  [
+    Worker, 
+    typeof(SharedWorker) !== 'undefined' && SharedWorker
+  ].forEach((w) => {
+    if(!w) return;
+    window[w.name as any] = new Proxy(w, workerHandler);
+  });
 }
 
 setWorkerProxy();