diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index f1ed7645c..b7df405bd 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -3359,7 +3359,9 @@ class e107
 		}
 
 		if ($no_cbrace)	$e_QUERY = str_replace(array('{', '}', '%7B', '%7b', '%7D', '%7d'), '', rawurldecode($e_QUERY));
-		$e_QUERY = htmlentities(self::getParser()->post_toForm($e_QUERY));
+		
+	//	$e_QUERY = htmlentities(self::getParser()->post_toForm($e_QUERY)); //@see https://github.com/e107inc/e107/issues/719
+		$e_QUERY = htmlspecialchars(self::getParser()->post_toForm($e_QUERY)); 
 		
 		// e_QUERY SHOULD NOT BE DEFINED IF IN SNIGLE ENTRY MODE OR ALL URLS WILL BE BROKEN - it's defined later within the the router
 		if(!deftrue("e_SINGLE_ENTRY"))