diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 6e9ea138a..aee5f5123 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1633,7 +1633,7 @@ class documentController extends document {
 	 * @brief Move/ Delete the document in the seession
 	 **/
 	function procDocumentManageCheckedDocument() {
-		set_time_limit(50);
+		set_time_limit(0);
 		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
 
 		$type = Context::get('type');
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index defae8967..72b6e8a52 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -902,7 +902,7 @@
             $extra_keys = $this->getExtraKeys($module_srl);
             Context::set('extra_keys', $extra_keys);
 			$security = new Security();
-			$security->encodeHTML('extra_keys..name','extra_keys..eid');
+			$security->encodeHTML('extra_keys..eid');
 
 			// Get information of module_grants
             $oTemplate = &TemplateHandler::getInstance();
diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
index 4b850aa7c..c7e800485 100644
--- a/modules/document/tpl/extra_keys.html
+++ b/modules/document/tpl/extra_keys.html
@@ -29,7 +29,7 @@
 				<tr>
 					<th>{$lang->column_name}</th>
 					<td >
-						<input type="text" name="name" value="{$selected_var->name}" id="name" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a> 
+						<input type="text" name="name" value="{htmlspecialchars($selected_var->name)}" id="name" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a> 
 					</td>
 				</tr>
 				<tr>