diff --git a/404.html b/404.html
index 5f8a0a4..cbc01c2 100644
--- a/404.html
+++ b/404.html
@@ -33,7 +33,7 @@ <h1>Hello there! Feel free to post your message/comment/query to me</h1>
                                     <iframe name="hidden_iframe" src="about:blank" hidden></iframe>
 
     <script>
-        document.getElementById("submit").setAttribute("formaction", atob(location.pathname.substr(10,).replace(/_/g,'+').replace(/-/g,'/')));
+        document.getElementById("submit").setAttribute("formaction", atob(location.pathname.split('/').pop().replace(/_/g,'+').replace(/-/g,'/')));
     </script>
     </body>
 </html>
diff --git a/app/bg-worker.js b/app/bg-worker.js
index 17be65d..6f2799e 100644
--- a/app/bg-worker.js
+++ b/app/bg-worker.js
@@ -11,7 +11,7 @@ function urlEncoded2Json(str){
     for (let el of arr) {
         let elArray = el.split('=');
         let val = decodeURIComponent(elArray[1].replace( /\+/g, ' ' )).replace(/"/g,'\\"'); // Decoded and escaped
-        eval(`obj.${elArray[0]}="${val}"`);
+        obj[elArray[0]]=val;
     }
     
     return JSON.stringify(obj);
diff --git a/app/server.js b/app/server.js
index 3d93ded..02aecf0 100644
--- a/app/server.js
+++ b/app/server.js
@@ -38,7 +38,7 @@ function inbox(json){
         const cell = document.createElement("td");
 
         // Create a text entry:
-        entry = eval(`data.${keysEnumArray[key]}`);
+        entry = data[keysEnumArray[key]];
 
         // Append entry to cell:
         cell.append(entry);
@@ -140,7 +140,7 @@ function startWorker() {
     document.getElementById("serverStatus").innerHTML = 'Live  <span class="spinner-grow spinner-grow-sm"></span>';
     
     document.getElementById("formActionURL").innerHTML = `<p class="alert alert-success">HTML Form Action URL: <u>${getFrom}</u></p>`;
-    document.getElementById("readyForm").href = `./${btoa(getFrom).replace(/\+/g,'_').replace(/\//g,'-')}`;
+    document.getElementById("readyForm").href = `./${btoa(getFrom).replace(/\+/g,'_').replace(/\//g,'-').replace(/=+$/,''}`;
     document.getElementById("testFormBtn").setAttribute("formaction", getFrom);
     spaShow("testForm");
 }