diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index 140358b0b..6f8f5b7fb 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -433,7 +433,7 @@ class DocumentAdminController extends Document
 		// We need to do this twice because of the unique constraint.
 		foreach ($changes as $change)
 		{
-			$output = executeQuery('document.updateDocumentExtraKeyIdxByEid', [
+			$output = executeQuery('document.updateDocumentExtraKeyIdx', [
 				'module_srl' => $module_srl,
 				'eid' => $change['eid'],
 				'var_idx' => $change['old_idx'],
@@ -445,7 +445,7 @@ class DocumentAdminController extends Document
 				return $output;
 			}
 
-			$output = executeQuery('document.updateDocumentExtraVarIdxByEid', [
+			$output = executeQuery('document.updateDocumentExtraVarIdx', [
 				'module_srl' => $module_srl,
 				'eid' => $change['eid'],
 				'var_idx' => $change['old_idx'],
diff --git a/modules/document/queries/updateDocumentExtraKeyIdx.xml b/modules/document/queries/updateDocumentExtraKeyIdx.xml
index c99ed6ee6..f0a301328 100644
--- a/modules/document/queries/updateDocumentExtraKeyIdx.xml
+++ b/modules/document/queries/updateDocumentExtraKeyIdx.xml
@@ -7,6 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+		<condition operation="equal" column="var_idx" var="var_idx" filter="number" />
+        <condition operation="equal" column="eid" var="eid" />
     </conditions>
 </query>
diff --git a/modules/document/queries/updateDocumentExtraKeyIdxByEid.xml b/modules/document/queries/updateDocumentExtraKeyIdxByEid.xml
deleted file mode 100644
index 7c7bfe772..000000000
--- a/modules/document/queries/updateDocumentExtraKeyIdxByEid.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<query id="updateDocumentExtraKeyIdxByEid" action="update">
-    <tables>
-        <table name="document_extra_keys" />
-    </tables>
-    <columns>
-        <column name="var_idx" var="new_idx" notnull="notnull" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-		<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" />
-        <condition operation="equal" column="eid" var="eid" notnull="notnull" />
-    </conditions>
-</query>
diff --git a/modules/document/queries/updateDocumentExtraVarIdx.xml b/modules/document/queries/updateDocumentExtraVarIdx.xml
index 1620b2132..8e641dc0e 100644
--- a/modules/document/queries/updateDocumentExtraVarIdx.xml
+++ b/modules/document/queries/updateDocumentExtraVarIdx.xml
@@ -7,6 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" />
+        <condition operation="equal" column="eid" var="eid" />
     </conditions>
 </query>
diff --git a/modules/document/queries/updateDocumentExtraVarIdxByEid.xml b/modules/document/queries/updateDocumentExtraVarIdxByEid.xml
deleted file mode 100644
index 680a97394..000000000
--- a/modules/document/queries/updateDocumentExtraVarIdxByEid.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<query id="updateDocumentExtraVarIdxByEid" action="update">
-    <tables>
-        <table name="document_extra_vars" />
-    </tables>
-    <columns>
-        <column name="var_idx" var="new_idx" notnull="notnull" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-		<condition operation="equal" column="var_idx" var="var_idx" notnull="notnull" />
-        <condition operation="equal" column="eid" var="eid" notnull="notnull" />
-    </conditions>
-</query>