diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 39a2d8004..3ad19bf5e 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -465,12 +465,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if(!$this->_categories) {
-			$queryStr = "SELECT * FROM `tblCategory` where `id` in (select `categoryID` from `tblDocumentCategory` where `documentID` = ".$this->_id.")";
+			$queryStr = "SELECT * FROM `tblCategory` WHERE `id` IN (SELECT `categoryID` FROM `tblDocumentCategory` WHERE `documentID` = ".$this->_id.")";
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)
 				return false;
 
-            $this->_categories = [];
+			$this->_categories = [];
 			foreach ($resArr as $row) {
 				$cat = new SeedDMS_Core_DocumentCategory($row['id'], $row['name']);
 				$cat->setDMS($this->_dms);
@@ -492,7 +492,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$db->startTransaction();
-		$queryStr = "DELETE from `tblDocumentCategory` WHERE `documentID` = ". $this->_id;
+		$queryStr = "DELETE FROM `tblDocumentCategory` WHERE `documentID` = ". $this->_id;
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -557,7 +557,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		foreach($categories as $cat)
 			$catids[] = $cat->getID();
 
-		$queryStr = "DELETE from `tblDocumentCategory` WHERE `documentID` = ". $this->_id ." AND `categoryID` IN (".implode(',', $catids).")";
+		$queryStr = "DELETE FROM `tblDocumentCategory` WHERE `documentID` = ". $this->_id ." AND `categoryID` IN (".implode(',', $catids).")";
 		if (!$db->getResult($queryStr)) {
 			return false;
 		}
@@ -1004,7 +1004,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				$modeStr = " AND mode".$op.(int)$mode;
 			}
 			$queryStr = "SELECT * FROM `tblACLs` WHERE `targetType` = ".T_DOCUMENT.
-				" AND target = " . $this->_id .	$modeStr . " ORDER BY `targetType`";
+				" AND target = " . $this->_id . $modeStr . " ORDER BY `targetType`";
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)
 				return false;
@@ -1540,7 +1540,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		 * innodb is used. That's why the version is now determined here.
 		 */
 		if ((int)$version<1) {
-			$queryStr = "SELECT MAX(`version`) as m from `tblDocumentContent` where `document` = ".$this->_id;
+			$queryStr = "SELECT MAX(`version`) AS m FROM `tblDocumentContent` WHERE `document` = ".$this->_id;
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)
 				return false;
@@ -1714,7 +1714,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		/* If $version < 1 than replace the content of the latest version.
 		 */
 		if ((int) $version<1) {
-			$queryStr = "SELECT MAX(`version`) as m from `tblDocumentContent` where `document` = ".$this->_id;
+			$queryStr = "SELECT MAX(`version`) AS m FROM `tblDocumentContent` WHERE `document` = ".$this->_id;
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)
 				return false;
@@ -1946,7 +1946,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$status = $version->getStatus();
 		$stID = $status["statusID"];
 
-		$queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() .	" AND `version` = " . $version->getVersion();
+		$queryStr = "DELETE FROM `tblDocumentContent` WHERE `document` = " . $this->getID() . " AND `version` = " . $version->getVersion();
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -2681,7 +2681,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function getFolderList() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "SELECT `folderList` FROM `tblDocuments` where id = ".$this->_id;
+		$queryStr = "SELECT `folderList` FROM `tblDocuments` WHERE id = ".$this->_id;
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)
 			return false;
@@ -3112,7 +3112,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 
 		$db = $this->_document->getDMS()->getDB();
-		$queryStr = "UPDATE `tblDocumentContent` SET `fileSize` = ".$filesize." where `document` = " . $this->_document->getID() .  " AND `version` = " . $this->_version;
+		$queryStr = "UPDATE `tblDocumentContent` SET `fileSize` = ".$filesize." WHERE `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version;
 		if (!$db->getResult($queryStr))
 			return false;
 		$this->_fileSize = $filesize;
@@ -3133,7 +3133,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 
 		$db = $this->_document->getDMS()->getDB();
-		$queryStr = "UPDATE `tblDocumentContent` SET `checksum` = ".$db->qstr($checksum)." where `document` = " . $this->_document->getID() .  " AND `version` = " . $this->_version;
+		$queryStr = "UPDATE `tblDocumentContent` SET `checksum` = ".$db->qstr($checksum)." WHERE `document` = " . $this->_document->getID() . " AND `version` = " . $this->_version;
 		if (!$db->getResult($queryStr))
 			return false;
 		$this->_checksum = $checksum;
@@ -3323,7 +3323,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$db->startTransaction();
 
 		/* First, remove the old entries */
-		$queryStr = "DELETE from `tblDocumentStatusLog` where `statusID`=".$statusID;
+		$queryStr = "DELETE FROM `tblDocumentStatusLog` WHERE `statusID`=".$statusID;
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -3606,13 +3606,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$reviewID = $review['reviewID'];
 
 				/* First, remove the old entries */
-				$queryStr = "DELETE from `tblDocumentReviewLog` where `reviewID`=".$reviewID;
+				$queryStr = "DELETE FROM `tblDocumentReviewLog` WHERE `reviewID`=".$reviewID;
 				if (!$db->getResult($queryStr)) {
 					$db->rollbackTransaction();
 					return false;
 				}
 
-				$queryStr = "DELETE from `tblDocumentReviewers` where `reviewID`=".$reviewID;
+				$queryStr = "DELETE FROM `tblDocumentReviewers` WHERE `reviewID`=".$reviewID;
 				if (!$db->getResult($queryStr)) {
 					$db->rollbackTransaction();
 					return false;
@@ -3786,13 +3786,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$reviewID = $review['reviewID'];
 
 				/* First, remove the old entries */
-				$queryStr = "DELETE from `tblDocumentApproveLog` where `approveID`=".$reviewID;
+				$queryStr = "DELETE FROM `tblDocumentApproveLog` WHERE `approveID`=".$reviewID;
 				if (!$db->getResult($queryStr)) {
 					$db->rollbackTransaction();
 					return false;
 				}
 
-				$queryStr = "DELETE from `tblDocumentApprovers` where `approveID`=".$reviewID;
+				$queryStr = "DELETE FROM `tblDocumentApprovers` WHERE `approveID`=".$reviewID;
 				if (!$db->getResult($queryStr)) {
 					$db->rollbackTransaction();
 					return false;