diff --git a/src/components/windows/UserArea.jsx b/src/components/windows/UserArea.jsx
index e72ec4b5..2a2bec8f 100644
--- a/src/components/windows/UserArea.jsx
+++ b/src/components/windows/UserArea.jsx
@@ -14,8 +14,9 @@ import useInterval from '../hooks/interval';
 import LogInArea from '../LogInArea';
 import Tabs from '../Tabs';
 import UserAreaContent from '../UserAreaContent';
-import Rankings from '../Rankings';
 
+// eslint-disable-next-line max-len
+const Rankings = React.lazy(() => import(/* webpackChunkName: "stats" */ '../Rankings'));
 // eslint-disable-next-line max-len
 const Converter = React.lazy(() => import(/* webpackChunkName: "converter" */ '../Converter'));
 // eslint-disable-next-line max-len
@@ -55,8 +56,10 @@ const UserArea = () => {
         <div label={t`Profile`}>
           {(name) ? <UserAreaContent /> : <LogInArea />}
         </div>
-        <div label={t`Ranking`}>
-          <Rankings />
+        <div label={t`Statistics`}>
+          <Suspense fallback={<div>Loading...</div>}>
+            <Rankings />
+          </Suspense>
         </div>
         <div label={t`Converter`}>
           <Suspense fallback={<div>Loading...</div>}>
diff --git a/src/components/windows/popUpAvailable.js b/src/components/windows/popUpAvailable.js
index 4724ca55..f4b795e9 100644
--- a/src/components/windows/popUpAvailable.js
+++ b/src/components/windows/popUpAvailable.js
@@ -31,7 +31,7 @@ export function buildPopUpUrl(windowType, argsIn) {
     for (let i = 0; i < typeArr.length; i += 1) {
       const key = typeArr[i];
       if (args[key]) {
-        path += `/${args[key]}`;
+        path += `/${encodeURIComponent(args[key])}`;
         delete args[key];
       }
     }
diff --git a/src/store/reducers/popup.js b/src/store/reducers/popup.js
index d7edd317..d16695dd 100644
--- a/src/store/reducers/popup.js
+++ b/src/store/reducers/popup.js
@@ -20,7 +20,7 @@ function getWinDataFromURL() {
     let i = Math.min(typeArr.length, argsArr.length);
     while (i > 0) {
       i -= 1;
-      args[typeArr[i]] = argsArr[i];
+      args[typeArr[i]] = decodeURIComponent(argsArr[i]);
     }
   }
   /*