diff --git a/src/MicroweberPackages/App/Http/Controllers/ApiController.php b/src/MicroweberPackages/App/Http/Controllers/ApiController.php
index 3410786e395..a59dbf8fb0f 100644
--- a/src/MicroweberPackages/App/Http/Controllers/ApiController.php
+++ b/src/MicroweberPackages/App/Http/Controllers/ApiController.php
@@ -616,6 +616,8 @@ public function module()
                 if(is_string($v)) {
                     $v = str_replace('<', '-', $v);
                     $v = str_replace('>', '-', $v);
+                    $v = str_replace('"', '-', $v);
+                    $v = str_replace("'", '-', $v);
                 }
                 if(is_array($v)) {
                     $v = $xssClean->cleanArray($v);
@@ -626,6 +628,8 @@ public function module()
                 if(is_string($k)){
                     $k = str_replace('<', '-', $k);
                     $k = str_replace('>', '-', $k);
+                    $k = str_replace('"', '-', $k);
+                    $k = str_replace("'", '-', $k);
 
                     $k = $xssClean->clean($k);
                     if($k){
diff --git a/src/MicroweberPackages/Helper/XSSClean.php b/src/MicroweberPackages/Helper/XSSClean.php
index c88a99988f9..7a512cd84ce 100644
--- a/src/MicroweberPackages/Helper/XSSClean.php
+++ b/src/MicroweberPackages/Helper/XSSClean.php
@@ -99,6 +99,7 @@ public function clean($html)
             'ondragleave',
             'ondragover',
             'ondragstart',
+            'ondragexit',
             'ondrop',
             'onfocusout',
             'onfullscreenchange',