diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 8ec5aae..f540669 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -152,31 +152,46 @@
      -->
    </filter>
 
-   <!-- Allow CORS for all by default, restricted to GET,HEAD,OPTIONS (no PUT,POST,DELETE) -->
-   <filter>
-        <filter-name>cross-origin</filter-name>
-        <!-- Tomcat -->
-        <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
-        <!-- Jetty 
-        <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
-        -->
+    <!-- Allow CORS for all by default, restricted to GET,HEAD,OPTIONS (no PUT,POST,DELETE) -->
+    <!-- Tomcat -->
+    <filter>
+      <filter-name>cross-origin</filter-name>
+      <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+      <init-param>
+        <param-name>cors.allowed.origins</param-name>
+        <param-value>*</param-value>
+      </init-param>
+      <init-param>
+        <param-name>cors.allowed.methods</param-name>
+        <param-value>GET,HEAD,OPTIONS</param-value>
+      </init-param>
+      <init-param>
+        <param-name>cors.allowed.headers</param-name>
+        <param-value>*</param-value>
+      </init-param>
+    </filter>
+    <!-- Jetty 
+    <filter>
+      <filter-name>cross-origin</filter-name>
+      <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
        <init-param>
-           <param-name>chainPreflight</param-name>
-           <param-value>false</param-value>
+         <param-name>chainPreflight</param-name>
+         <param-value>false</param-value>
        </init-param>
        <init-param>
-           <param-name>allowedOrigins</param-name>
-           <param-value>*</param-value>
+         <param-name>allowedOrigins</param-name>
+         <param-value>*</param-value>
        </init-param>
        <init-param>
-           <param-name>allowedMethods</param-name>
-           <param-value>GET,HEAD,OPTIONS</param-value>
+         <param-name>allowedMethods</param-name>
+         <param-value>GET,HEAD,OPTIONS</param-value>
        </init-param>
        <init-param>
-           <param-name>allowedHeaders</param-name>
-           <param-value>*</param-value>
-       </init-param>
+         <param-name>allowedHeaders</param-name>
+         <param-value>*</param-value>
+      </init-param>
     </filter>
+    -->
 
     <!-- 
       THIS FILTER MUST BE THE FIRST ONE, otherwise we end up with ruined chars in the input from the GUI