diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 96ae4b0c7..516ca8ddd 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1628,10 +1628,17 @@ class SeedDMS_Core_DMS {
 						$searchQuery .= " ORDER BY `tblFolders`.`name` DESC";
 						break;
 					case 'na':
-					default:
 						$searchQuery .= " ORDER BY `tblFolders`.`name`";
 						break;
-                    }
+					case 'id':
+						$searchQuery .= " ORDER BY `tblFolders`.`id` DESC";
+						break;
+					case 'ia':
+						$searchQuery .= " ORDER BY `tblFolders`.`id`";
+						break;
+					default:
+						break;
+					}
 
 					if($limit) {
 						$searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
@@ -1925,9 +1932,17 @@ class SeedDMS_Core_DMS {
 					$orderbyQuery = " ORDER BY `tblDocuments`.`name` DESC";
 					break;
 				case 'na':
-				default:
 					$orderbyQuery = " ORDER BY `tblDocuments`.`name`";
 					break;
+				case 'id':
+					$orderbyQuery = " ORDER BY `tblDocuments`.`id` DESC";
+					break;
+				case 'ia':
+					$orderbyQuery = " ORDER BY `tblDocuments`.`id`";
+					break;
+				default:
+					$orderbyQuery = "";
+					break;
 				}
 
 				// calculate the remaining entrїes of the current page