diff --git a/public/.htaccess b/public/.htaccess
index aff8e51d..d554246d 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -5,10 +5,12 @@ RewriteBase /
 RewriteCond %{REQUEST_FILENAME} -f [OR]
 RewriteCond %{REQUEST_FILENAME} -l [OR]
 RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule .+ - [L]
+RewriteRule .* - [L]
 
+# if request is no valid file NOR directory
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 # if static asset do not do anything
-RewriteRule (.*)(css|js|html|png|jpg|jpeg|gif|bmp|ico|json|csv|otf|eot|svg|svgz|ttf|woff|woff2|ijmap|pdf|tif|map)$ - [L,R=404]
+RewriteRule (.*)(css|js|html|png|jpe?g|gif|bmp|ico|json|csv|otf|eot|svg|svgz|ttf|woff|woff2|ijmap|pdf|tif|map)$ - [NC,L,R=404]
+# everything else should be redirected to /index.html so it can be routed by it
 RewriteRule (.*) /index.html [L]