diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index cc36015dc..ecfea69d6 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -82,6 +82,9 @@
 				$cubrid_version = $cubrid_version_elem[0] . '.' . $cubrid_version_elem[1] . '.' . $cubrid_version_elem[2];
 				define('__CUBRID_VERSION__', $cubrid_version);
 			}
+			
+			if(__CUBRID_VERSION__ >= '8.4.1')
+				cubrid_set_autocommit($result, CUBRID_AUTOCOMMIT_FALSE);			
             
 			return $result;
 		}
@@ -135,9 +138,9 @@
 		 **/
 		function _rollback()
 		{
-                        $connection = $this->_getConnection('master');
+            $connection = $this->_getConnection('master');
 			@cubrid_rollback ($connection);
-                        return true;
+            return true;
 		}
 
 		/**
diff --git a/modules/document/queries/updateDocumentExtraKeyIdxOrder.xml b/modules/document/queries/updateDocumentExtraKeyIdxOrder.xml
index 101e55eaa..16aaf9fca 100644
--- a/modules/document/queries/updateDocumentExtraKeyIdxOrder.xml
+++ b/modules/document/queries/updateDocumentExtraKeyIdxOrder.xml
@@ -7,6 +7,6 @@
 	</columns>
 	<conditions>
 		<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-		<condition operation="excess" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+		<condition operation="excess" column="var_idx" var="var_idx" filter="number" pipe="and" />
 	</conditions>
 </query>
diff --git a/modules/document/queries/updateDocumentExtraVarIdxOrder.xml b/modules/document/queries/updateDocumentExtraVarIdxOrder.xml
index 83887df85..a6ad2101b 100644
--- a/modules/document/queries/updateDocumentExtraVarIdxOrder.xml
+++ b/modules/document/queries/updateDocumentExtraVarIdxOrder.xml
@@ -7,6 +7,6 @@
 	</columns>
 	<conditions>
 		<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-		<condition operation="excess" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+		<condition operation="excess" column="var_idx" var="var_idx" filter="number" pipe="and" />
 	</conditions>
 </query>