diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php
index 13abbd91d..c3f229ca0 100644
--- a/modules/comment/comment.admin.view.php
+++ b/modules/comment/comment.admin.view.php
@@ -67,26 +67,12 @@ class CommentAdminView extends Comment
 		Context::set('secret_name_list', $secretNameList);
 
 		// Module List
-		$oModuleModel = getModel('module');
-		$module_list = array();
-		$mod_srls = array();
-		foreach($output->data as $val)
+		$module_list = [];
+		$mod_output = executeQueryArray('comment.getModuleList');
+		foreach ($mod_output->data as $item)
 		{
-			$mod_srls[] = $val->module_srl;
-		}
-		$mod_srls = array_unique($mod_srls);
-		$mod_srls_count = count($mod_srls);
-		if($mod_srls_count)
-		{
-			$columnList = array('module_srl', 'mid', 'browser_title');
-			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-			if($module_output && is_array($module_output))
-			{
-				foreach($module_output as $module)
-				{
-					$module_list[$module->module_srl] = $module;
-				}
-			}
+			$item->browser_title = Context::replaceUserLang($item->browser_title);
+			$module_list[$item->module_srl] = $item;
 		}
 		Context::set('module_list', $module_list);
 
@@ -115,8 +101,9 @@ class CommentAdminView extends Comment
 		}
 		Context::set('member_nick_name', $member_nick_name);
 
-		$security = new Security();
-		$security->encodeHTML('search_target', 'search_keyword');
+		// Other search options
+		Context::set('search_target', escape(Context::get('search_target'), false));
+		Context::set('search_keyword', escape(Context::get('search_keyword'), false));
 
 		// set the template
 		$this->setTemplatePath($this->module_path . 'tpl');
diff --git a/modules/comment/queries/getModuleList.xml b/modules/comment/queries/getModuleList.xml
new file mode 100644
index 000000000..35c3b1c85
--- /dev/null
+++ b/modules/comment/queries/getModuleList.xml
@@ -0,0 +1,20 @@
+<query id="getModuleList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+		<column name="mid" />
+		<column name="browser_title" />
+    </columns>
+	<conditions>
+		<query operation="in" column="module_srl">
+			<tables>
+				<table name="comments" />
+			</tables>
+			<columns distinct="distinct">
+				<column name="module_srl" />
+			</columns>
+		</query>
+	</conditions>
+</query>
diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index ff14e4691..6b71dce04 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -124,8 +124,13 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 <form action="./" method="get" class="search center x_input-append" onsubmit="return checkSearch(this)">
 	<input type="hidden" name="module" value="{$module}" />
 	<input type="hidden" name="act" value="{$act}" />
-	<input type="hidden" name="module_srl" value="{$module_srl}" />
 	<input type="hidden" name="error_return_url" value="" />
+	<select name="module_srl" style="margin-right:4px">
+		<option value="">{lang('all')}</option>
+		<!--@foreach($module_list as $item)-->
+			<option value="{$item->module_srl}" <!--@if(isset($module_srl) && $module_srl == $item->module_srl)-->selected="selected"<!--@end-->>{$item->browser_title}</option>
+		<!--@endforeach-->
+	</select>
 	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<!--@foreach(lang('comment.search_target_list') as $key => $val)-->
 		<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 4e943b577..5db78c216 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -82,26 +82,12 @@ class DocumentAdminView extends Document
 		Context::set('search_option', $search_option);
 
 		// Module List
-		$oModuleModel = getModel('module');
-		$module_list = array();
-		$mod_srls = array();
-		foreach($output->data as $oDocument)
+		$module_list = [];
+		$mod_output = executeQueryArray('document.getModuleList');
+		foreach ($mod_output->data as $item)
 		{
-			$mod_srls[] = $oDocument->get('module_srl');
-		}
-		$mod_srls = array_unique($mod_srls);
-		$mod_srls_count = count($mod_srls);
-		if($mod_srls_count)
-		{
-			$columnList = array('module_srl', 'mid', 'browser_title');
-			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-			if($module_output && is_array($module_output))
-			{
-				foreach($module_output as $module)
-				{
-					$module_list[$module->module_srl] = $module;
-				}
-			}
+			$item->browser_title = Context::replaceUserLang($item->browser_title);
+			$module_list[$item->module_srl] = $item;
 		}
 		Context::set('module_list', $module_list);
 
@@ -130,8 +116,10 @@ class DocumentAdminView extends Document
 		}
 		Context::set('member_nick_name', $member_nick_name);
 
-		$security = new Security();
-		$security->encodeHTML('search_target', 'search_keyword');
+		// Other search options
+		Context::set('search_target', escape(Context::get('search_target'), false));
+		Context::set('search_keyword', escape(Context::get('search_keyword'), false));
+		Context::set('is_secret', Context::get('is_secret') === 'Y' ? 'Y' : 'N');
 
 		// Specify a template
 		$this->setTemplatePath($this->module_path.'tpl');
diff --git a/modules/document/queries/getModuleList.xml b/modules/document/queries/getModuleList.xml
new file mode 100644
index 000000000..f674afea2
--- /dev/null
+++ b/modules/document/queries/getModuleList.xml
@@ -0,0 +1,20 @@
+<query id="getModuleList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+		<column name="mid" />
+		<column name="browser_title" />
+    </columns>
+	<conditions>
+		<query operation="in" column="module_srl">
+			<tables>
+				<table name="documents" />
+			</tables>
+			<columns distinct="distinct">
+				<column name="module_srl" />
+			</columns>
+		</query>
+	</conditions>
+</query>
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 20ca7a103..db538d2ee 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -120,8 +120,13 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 <form action="./" method="get" class="search center x_input-append x_clearfix">
 	<input type="hidden" name="module" value="{$module}" />
 	<input type="hidden" name="act" value="{$act}" />
-	<input type="hidden" name="module_srl" value="{$module_srl}" />
 	<input type="hidden" name="error_return_url" value="" />
+	<select name="module_srl" style="margin-right:4px">
+		<option value="">{lang('all')}</option>
+		<!--@foreach($module_list as $item)-->
+			<option value="{$item->module_srl}" <!--@if(isset($module_srl) && $module_srl == $item->module_srl)-->selected="selected"<!--@end-->>{$item->browser_title}</option>
+		<!--@endforeach-->
+	</select>
 	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<!--@foreach(lang('document.search_target_list') as $key => $val)-->
 		<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index ff05e46bf..abd23c5b1 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -37,7 +37,7 @@ class FileAdminView extends File
 			$file_list = array();
 			$document_list = array();
 			$comment_list = array();
-			$module_list= array();
+			$module_list = array();
 
 			$doc_srls = array();
 			$com_srls = array();
@@ -162,20 +162,6 @@ class FileAdminView extends File
 					}
 				}
 			}
-			// Module List
-			$mod_srls_count = count($mod_srls);
-			if($mod_srls_count)
-			{
-				$columnList = array('module_srl', 'mid', 'browser_title');
-				$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-				if($module_output && is_array($module_output))
-				{
-					foreach($module_output as $module)
-					{
-						$module_list[$module->module_srl] = $module;
-					}
-				}
-			}
 
 			foreach($file_list as $srl => $file)
 			{
@@ -186,6 +172,15 @@ class FileAdminView extends File
 			}
 		}
 
+		// Module list
+		$mod_output = executeQueryArray('comment.getModuleList');
+		foreach ($mod_output->data as $item)
+		{
+			$item->browser_title = Context::replaceUserLang($item->browser_title);
+			$module_list[$item->module_srl] = $item;
+		}
+		Context::set('module_list', $module_list);
+
 		Context::set('file_list', $file_list);
 		Context::set('document_list', $document_list);
 		Context::set('comment_list', $comment_list);
diff --git a/modules/file/queries/getModuleList.xml b/modules/file/queries/getModuleList.xml
new file mode 100644
index 000000000..f03e896b4
--- /dev/null
+++ b/modules/file/queries/getModuleList.xml
@@ -0,0 +1,20 @@
+<query id="getModuleList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+		<column name="mid" />
+		<column name="browser_title" />
+    </columns>
+	<conditions>
+		<query operation="in" column="module_srl">
+			<tables>
+				<table name="files" />
+			</tables>
+			<columns distinct="distinct">
+				<column name="module_srl" />
+			</columns>
+		</query>
+	</conditions>
+</query>
diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index 74904cb20..06fb7bd02 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -184,8 +184,13 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 <form action="./" method="get" onsubmit="return checkSearch(this)" class="search center x_input-append">
 	<input type="hidden" name="module" value="{$module}" />
 	<input type="hidden" name="act" value="{$act}" />
-	<input type="hidden" name="module_srl" value="{$module_srl}" />
 	<input type="hidden" name="error_return_url" value="" />
+	<select name="module_srl" style="margin-right:4px">
+		<option value="">{lang('all')}</option>
+		<!--@foreach($module_list as $item)-->
+			<option value="{$item->module_srl}" <!--@if(isset($module_srl) && $module_srl == $item->module_srl)-->selected="selected"<!--@end-->>{$item->browser_title}</option>
+		<!--@endforeach-->
+	</select>
 	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<!--@foreach(lang('file.file_search_target_list') as $key => $val)-->
 		<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>