diff --git a/modules/tag/queries/deleteTagByTag.xml b/modules/tag/queries/deleteTagByTag.xml
new file mode 100644
index 000000000..d463cf28c
--- /dev/null
+++ b/modules/tag/queries/deleteTagByTag.xml
@@ -0,0 +1,9 @@
+<query id="deleteTagByTag" action="delete">
+    <tables>
+        <table name="tags" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="tag" var="tag" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/tag/queries/getAllTagList.xml b/modules/tag/queries/getAllTagList.xml
new file mode 100644
index 000000000..c57852419
--- /dev/null
+++ b/modules/tag/queries/getAllTagList.xml
@@ -0,0 +1,12 @@
+<query id="getDocumentsTagList" action="select">
+    <tables>
+        <table name="tags" />
+    </tables>
+    <columns>
+        <column name="document_srl" />
+        <column name="tag" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="document_srl" var="document_srl" filter="number" />
+    </conditions>
+</query>
diff --git a/modules/tag/queries/getDocumentsTagList.xml b/modules/tag/queries/getDocumentsTagList.xml
index 0ecee7415..b33c2250a 100644
--- a/modules/tag/queries/getDocumentsTagList.xml
+++ b/modules/tag/queries/getDocumentsTagList.xml
@@ -1,4 +1,4 @@
-<query id="getTagWithUsedList" action="select">
+<query id="getDocumentsTagList" action="select">
     <tables>
         <table name="tags" />
     </tables>
@@ -7,10 +7,11 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="in" column="document_srl" var="document_srl" />
+        <condition operation="in" column="document_srl" var="document_srl" filter="number" />
     </conditions>
     <navigation>
         <index var="count" default="count" order="desc" />
+        <list_count var="list_count" default="100" />
     </navigation>
     <groups>
         <group column="tag" />
diff --git a/modules/tag/tag.model.php b/modules/tag/tag.model.php
index b9de0933e..7b5ef880e 100644
--- a/modules/tag/tag.model.php
+++ b/modules/tag/tag.model.php
@@ -75,7 +75,9 @@
 			$output = $this->getDocumentSrlByTag($args);
 			$document_srl = array();
 
-			foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			if($output->data){
+				foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			}
 			unset($args);
 			$args->document_srl = $document_srl;
 			$output = $this->getDocumentsTagList($args);