diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index ddee43fec..746d521cc 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -685,6 +685,10 @@ class commentModel extends comment
 		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		$args->s_module_srl = $obj->module_srl;
 		$args->exclude_module_srl = $obj->exclude_module_srl;
+		if ($obj->is_secret)
+		{
+			$args->s_is_secret = $obj->is_secret;
+		}
 
 		// check if module is using comment validation system
 		$oCommentController = getController("comment");
diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php
index bb7bcf876..4c6d65399 100644
--- a/modules/file/file.admin.model.php
+++ b/modules/file/file.admin.model.php
@@ -80,6 +80,11 @@ class fileAdminModel extends file
 		$args->page_count = $obj->page_count?$obj->page_count:10;
 		$args->s_module_srl = $obj->module_srl;
 		$args->exclude_module_srl = $obj->exclude_module_srl;
+		if(toBool($obj->exclude_secret))
+		{
+			$args->document_status = 'PUBLIC';
+			$args->comment_is_secret = 'N';
+		}
 		// Execute the file.getFileList query
 		$output = executeQuery('file.getFileList', $args, $columnList);
 		// Return if no result or an error occurs
diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml
index ce9510d9f..7c67be90f 100644
--- a/modules/file/queries/getFileList.xml
+++ b/modules/file/queries/getFileList.xml
@@ -1,11 +1,21 @@
 <query id="getFileList" action="select">
     <tables>
         <table name="files" alias="files" />
-        <table name="member" alias="member" type="left join">
+        <table name="member" type="left join">
             <conditions>
                 <condition operation="equal" column="files.member_srl" default="member.member_srl" />
             </conditions>
         </table>
+        <table name="documents" type="left join">
+            <conditions>
+                <condition operation="equal" column="files.upload_target_srl" default="documents.document_srl" />
+            </conditions>
+        </table>
+        <table name="comments" type="left join">
+            <conditions>
+                <condition operation="equal" column="files.upload_target_srl" default="comments.comment_srl" />
+            </conditions>
+        </table>
     </tables>
     <columns>
         <column name="files.*" />
@@ -16,6 +26,14 @@
         <condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
         <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
 		<condition operation="below" column="files.regdate" var="regdate_before" pipe="and" />
+		<group pipe="and">
+			<condition operation="equal" column="documents.status" var="document_status" />
+			<condition operation="null" column="documents.status" pipe="or" />
+		</group>
+		<group pipe="and">
+			<condition operation="equal" column="comments.is_secret" var="comment_is_secret" />
+			<condition operation="null" column="comments.is_secret" pipe="or" />
+		</group>
         <group pipe="and">
             <condition operation="like" column="files.source_filename" var="s_filename" pipe="or" />
             <condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" />
diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php
index 242a99b36..e6638e85a 100644
--- a/modules/integration_search/integration_search.model.php
+++ b/modules/integration_search/integration_search.model.php
@@ -94,6 +94,7 @@ class integration_searchModel extends module
 		$args->page_count = 10;
 		$args->search_target = 'content';
 		$args->search_keyword = $search_keyword;
+		$args->is_secret = 'N';
 		$args->sort_index = 'list_order';
 		$args->order_type = 'asc';
 		// Get a list of documents
@@ -167,6 +168,7 @@ class integration_searchModel extends module
 		$args->order_type = 'desc';
 		$args->isvalid = 'Y';
 		$args->direct_download = $direct_download=='Y'?'Y':'N';
+		$args->exclude_secret = 'Y';
 		// Get a list of documents
 		$oFileAdminModel = getAdminModel('file');
 		$output = $oFileAdminModel->getFileList($args);