diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index b2aa0a985d..0081ac0967 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -62,7 +62,7 @@ function toDoc(&$oModule)
 
 		// SECISSUE https://github.com/xpressengine/xe-core/issues/1583
 		$oSecurity = new Security();
-		$oSecurity->encodeHTML('is_keyword');
+		$oSecurity->encodeHTML('is_keyword', 'search_keyword', 'search_target', 'order_target', 'order_type');
 
 		// add .x div for adminitration pages
 		if(Context::getResponseMethod() == 'HTML')