diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 16f3c052f..de56f6379 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -915,6 +915,8 @@ class Context
 	/**
 	 * Convert strings of variables in $source_object into UTF-8
 	 *
+	 * @deprecated
+	 *
 	 * @param object $source_obj Conatins strings to convert
 	 * @return object converted object
 	 */
@@ -950,6 +952,8 @@ class Context
 	/**
 	 * Check flag
 	 *
+	 * @deprecated
+	 *
 	 * @param mixed $val
 	 * @param string $key
 	 * @param mixed $charset charset
@@ -977,6 +981,8 @@ class Context
 	/**
 	 * Convert array type variables into UTF-8
 	 *
+	 * @deprecated
+	 *
 	 * @param mixed $val
 	 * @param string $key
 	 * @param string $charset character set
@@ -998,6 +1004,8 @@ class Context
 	/**
 	 * Convert strings into UTF-8
 	 *
+	 * @deprecated
+	 *
 	 * @param string $str String to convert
 	 * @return string converted string
 	 */
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 4bad74524..bc0dfae33 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -90,7 +90,7 @@ class ModuleHandler extends Handler
 		$this->is_mobile = Mobile::isFromMobilePhone();
         if($entry = Context::get('entry'))
         {
-            $this->entry = Context::convertEncodingStr($entry);
+            $this->entry = escape($entry, false);
         }
         if(!$this->module && $this->mid === 'admin')
         {