diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 8723577cd..66f923a8d 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -232,7 +232,7 @@ class documentModel extends document
 		{
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
-			$groupByQuery = array('document.getDocumentListWithinComment' => 1, 'document.getDocumentListWithinTag' => 1);
+			$groupByQuery = array('document.getDocumentListWithinComment' => 1, 'document.getDocumentListWithinTag' => 1, 'document.getDocumentListWithinExtraVars' => 1);
 			if(isset($groupByQuery[$query_id]))
 			{
 				$group_args = clone($args);
@@ -1417,6 +1417,10 @@ class documentModel extends document
 					$args->s_tags = str_replace(' ','%',$search_keyword);
 					$query_id = 'document.getDocumentListWithinTag';
 					break;
+				case 'extra_vars':
+					$args->var_value = str_replace(' ', '%', $search_keyword);
+					$query_id = 'document.getDocumentListWithinExtraVars';
+					break;
 				default :
 					if(strpos($search_target,'extra_vars')!==false) {
 						$args->var_idx = substr($search_target, strlen('extra_vars'));
diff --git a/modules/document/queries/getDocumentListWithinExtraVars.xml b/modules/document/queries/getDocumentListWithinExtraVars.xml
new file mode 100644
index 000000000..ce15a59b0
--- /dev/null
+++ b/modules/document/queries/getDocumentListWithinExtraVars.xml
@@ -0,0 +1,27 @@
+<query id="getDocumentListWithinExtraVars" action="select">
+    <tables>
+        <table name="documents" />
+        <table name="document_extra_vars" alias="extra_vars" />
+    </tables>
+    <columns>
+        <column name="documents.*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />
+        <condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="extra_vars.module_srl" default="documents.module_srl" pipe="and" />
+        <condition operation="equal" column="extra_vars.document_srl" default="documents.document_srl" pipe="and" />
+        <condition operation="in" column="documents.status" var="statusList" pipe="and" />
+        <condition operation="like" column="extra_vars.value" var="var_value" notnull="notnull" pipe="and" />
+    </conditions>
+    <groups>
+        <group column="extra_vars.document_srl" />
+    </groups>
+    <navigation>
+        <index var="sort_index" default="documents.list_order" order="order_type" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>