diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index 437e76f81..c64c5b571 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -1126,7 +1126,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 
 		switch($orderby) {
 		default:
-			$queryStr = "SELECT * FROM tblAttributeDefinitionGroups ORDER BY name";
+			$queryStr = "SELECT * FROM `tblAttributeDefinitionGroups` ORDER BY `name`";
 		}
 		$resArr = $db->getResultArray($queryStr);
 
@@ -1154,7 +1154,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 	function setName($newName) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblAttributeDefinitionGroups SET name = ".$db->qstr($newName)." WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblAttributeDefinitionGroups` SET `name` = ".$db->qstr($newName)." WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -1167,7 +1167,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 	function setComment($newComment) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblAttributeDefinitionGroups SET comment = ".$db->qstr($newComment)." WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblAttributeDefinitionGroups` SET `comment` = ".$db->qstr($newComment)." WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -1193,7 +1193,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 	function setSequence($attrdef, $newSequence) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblAttributeDefinitionGroupAttributeDefinition SET `sequence` = ".$db->qstr($newSequence)." WHERE `attrgrp` = " . $this->_id . " AND `attrdef` = " . $attrdef->getID();
+		$queryStr = "UPDATE `tblAttributeDefinitionGroupAttributeDefinition` SET `sequence` = ".$db->qstr($newSequence)." WHERE `attrgrp` = " . $this->_id . " AND `attrdef` = " . $attrdef->getID();
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -1218,7 +1218,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 	function setShow($attrdef, $newShow) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblAttributeDefinitionGroupAttributeDefinition SET `show` = ".$db->qstr($newShow)." WHERE `attrgrp` = " . $this->_id . " AND `attrdef` = " . $attrdef->getID();
+		$queryStr = "UPDATE `tblAttributeDefinitionGroupAttributeDefinition` SET `show` = ".$db->qstr($newShow)." WHERE `attrgrp` = " . $this->_id . " AND `attrdef` = " . $attrdef->getID();
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -1287,7 +1287,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 		else
 			$seq = $resArr[0]['m'] + 10.0;
 
-		$queryStr = "INSERT INTO tblAttributeDefinitionGroupAttributeDefinition (`attrgrp`, `attrdef`, `sequence`, `show`) VALUES (".$this->_id.", ".$attrdef->getID(). ", " . $seq . ", " . (int) $show ." )";
+		$queryStr = "INSERT INTO `tblAttributeDefinitionGroupAttributeDefinition` (`attrgrp`, `attrdef`, `sequence`, `show`) VALUES (".$this->_id.", ".$attrdef->getID(). ", " . $seq . ", " . (int) $show ." )";
 		$res = $db->getResult($queryStr);
 
 		if (!$res) return false;
@@ -1299,7 +1299,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 	function removeAttributeDefinition($attrdef) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "DELETE FROM tblAttributeDefinitionGroupAttributeDefinition WHERE attrgrp = ".$this->_id." AND attrdef = ".$attrdef->getID();
+		$queryStr = "DELETE FROM `tblAttributeDefinitionGroupAttributeDefinition` WHERE `attrgrp` = ".$this->_id." AND `attrdef` = ".$attrdef->getID();
 		$res = $db->getResult($queryStr);
 
 		if (!$res) return false;
@@ -1315,7 +1315,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 	 */
 	function isMember($attrdef) { /* {{{ */
 		$db = $this->_dms->getDB();
-		$queryStr = "SELECT * FROM tblAttributeDefinitionGroupAttributeDefinition WHERE attrgrp = " . $this->_id . " AND attrdef = " . $attrdef->getID();
+		$queryStr = "SELECT * FROM `tblAttributeDefinitionGroupAttributeDefinition` WHERE `attrgrp` = " . $this->_id . " AND `attrdef` = " . $attrdef->getID();
 
 		$resArr = $db->getResultArray($queryStr);
 
@@ -1362,7 +1362,7 @@ class SeedDMS_Core_AttributeDefinitionGroup { /* {{{ */
 
 		$db->startTransaction();
 
-		$queryStr = "DELETE FROM tblAttributeDefinitionGroups WHERE id = " . $this->_id;
+		$queryStr = "DELETE FROM `tblAttributeDefinitionGroups` WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;