diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf
index 0eb30ad44..22421dd50 100644
--- a/reverse-proxy/conf.d.dev/default.conf
+++ b/reverse-proxy/conf.d.dev/default.conf
@@ -1,7 +1,7 @@
 server {
   listen 80 default_server;
   include svr-includes/*;
-  add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'none'; frame-ancestors 'none';" always;
+  add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'self'; form-action 'none'; frame-ancestors 'none';" always;
 
   location ^~ /api/archival/ {
     rewrite    ^/api/archival/(.*)$ /$1 break;
diff --git a/reverse-proxy/conf.d/default.conf b/reverse-proxy/conf.d/default.conf
index bf5120218..913027dc9 100644
--- a/reverse-proxy/conf.d/default.conf
+++ b/reverse-proxy/conf.d/default.conf
@@ -4,7 +4,7 @@ server {
   include svr-includes/*;
   ssl_certificate /etc/nginx/cert/filterlists_cert.pem;
   ssl_certificate_key /etc/nginx/cert/filterlists_key.pem;
-  add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'none'; frame-ancestors 'none';" always;
+  add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'self'; form-action 'none'; frame-ancestors 'none';" always;
 
   location ^~ /api/archival/ {
     rewrite    ^/api/archival/(.*)$ /$1 break;
diff --git a/reverse-proxy/loc-includes/cors.conf b/reverse-proxy/loc-includes/cors.conf
index 06f77f8ac..84f1c78c8 100644
--- a/reverse-proxy/loc-includes/cors.conf
+++ b/reverse-proxy/loc-includes/cors.conf
@@ -2,30 +2,30 @@
 #
 # Wide-open CORS config for nginx
 #
-# if ($request_method = 'OPTIONS') {
-#    add_header 'Access-Control-Allow-Origin' '*';
-#    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-#    #
-#    # Custom headers and headers various browsers *should* be OK with but aren't
-#    #
-#    add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-#    #
-#    # Tell client that this pre-flight info is valid for 20 days
-#    #
-#    add_header 'Access-Control-Max-Age' 1728000;
-#    add_header 'Content-Type' 'text/plain; charset=utf-8';
-#    add_header 'Content-Length' 0;
-#    return 204;
-# }
-# if ($request_method = 'POST') {
-#    add_header 'Access-Control-Allow-Origin' '*';
-#    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-#    add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-#    add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
-# }
-# if ($request_method = 'GET') {
-#    add_header 'Access-Control-Allow-Origin' '*';
-#    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-#    add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-#    add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
-# }
\ No newline at end of file
+if ($request_method = 'OPTIONS') {
+   add_header 'Access-Control-Allow-Origin' '*';
+   add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+   #
+   # Custom headers and headers various browsers *should* be OK with but aren't
+   #
+   add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+   #
+   # Tell client that this pre-flight info is valid for 20 days
+   #
+   add_header 'Access-Control-Max-Age' 1728000;
+   add_header 'Content-Type' 'text/plain; charset=utf-8';
+   add_header 'Content-Length' 0;
+   return 204;
+}
+if ($request_method = 'POST') {
+   add_header 'Access-Control-Allow-Origin' '*';
+   add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+   add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+   add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
+}
+if ($request_method = 'GET') {
+   add_header 'Access-Control-Allow-Origin' '*';
+   add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+   add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+   add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
+}
\ No newline at end of file
diff --git a/web/public/index.html b/web/public/index.html
index 7b04db695..e72124aa2 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -37,6 +37,9 @@
       href="https://filterlists.com/icon_filterlists.png"
     />
     <link rel="canonical" href="https://filterlists.com/" />
+
+    <!-- https://github.com/froala/angular-froala/issues/170#issuecomment-386117678 -->
+    <base href="/">
   </head>
   <body>
     <div id="root"></div>