diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 28588543c..d8e40e934 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -74,7 +74,7 @@ class HTMLDisplayHandler
 
 		// 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')