diff --git a/index.html b/index.html
index a9a8bb7e..c2960539 100644
--- a/index.html
+++ b/index.html
@@ -90,6 +90,19 @@
       gtag('js', new Date());
       gtag('config', 'GTM-5HXGM54C');
     </script>
+
+    <script type="text/javascript">
+      (function(l) {
+        if (l.search[1] === '/' ) {
+          var decoded = l.search.slice(1).split('&').map(function(s) { 
+            return s.replace(/~and~/g, '&')
+          }).join('?');
+          window.history.replaceState(null, null,
+              l.pathname.slice(0, -1) + decoded + l.hash
+          );
+        }
+      }(window.location))
+    </script>
     
   </head>
   <body>
diff --git a/src/App.tsx b/src/App.tsx
index e93760cc..b7986503 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,4 @@
-
-import { HashRouter as Router, Routes, Route } from 'react-router-dom';
+import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
 import { Layout } from './components/layout/Layout';
 import { Home } from './pages/Home';
 import { About } from './pages/About';
