diff --git a/deploy/lib/Filter.php b/deploy/lib/Filter.php
index e2ca99559..15e704d95 100644
--- a/deploy/lib/Filter.php
+++ b/deploy/lib/Filter.php
@@ -31,7 +31,7 @@ public static function toInt($dirty)
     public static function filter_string_polyfill(string $string): string
     {
         $str = preg_replace('/\x00|<[^>]*>?/', '', $string);
-        return str_replace(["'", '"'], ['', ''], $str);
+        return str_replace(["'", '"'], ['&#39;', '&#34;'], $str);
     }
 
     /**
@@ -39,10 +39,10 @@ public static function filter_string_polyfill(string $string): string
      */
     public static function toSimple($dirty)
     {
-        return filter_var(
-            str_replace(['"', '\''], '', Filter::filter_string_polyfill($dirty)),
-            FILTER_UNSAFE_RAW,
+        return static::filter_string_polyfill(filter_var(
+            str_replace(['"', '\''], '', $dirty),
+            FILTER_SANITIZE_FULL_SPECIAL_CHARS,
             FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH
-        );
+        ));
     }
 }