diff --git a/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Computer Details.sql b/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Computer Details.sql
index ac0fb79..1adefe2 100644
--- a/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Computer Details.sql	
+++ b/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Computer Details.sql	
@@ -26,7 +26,8 @@ SELECT
 		WHEN computers_denormalized.model_identifier REGEXP "^(MacPro[1-5],[0-9]|iMac([1-9]|1[0-5]),[0-9]|(Macmini|MacBookAir)[1-6],[0-9]|MacBook[1-8],[0-9]|MacBookPro(([1-9]|10),[0-9]|11,[0-3]))$" THEN "Big Sur"
 		WHEN computers_denormalized.model_identifier REGEXP "^(MacPro[1-6],[0-9]|iMac([1-9]|1[0-7]),[0-9]|(Macmini|MacBookAir)[1-7],[0-9]|MacBook[1-9],[0-9]|MacBookPro([1-9]|1[0-3]),[0-9])$" THEN "Monterey"
 		WHEN computers_denormalized.model_identifier REGEXP "^(MacPro[1-6],[0-9]|iMac([1-9]|1[0-8]),[0-9]|(Macmini|MacBookAir)[1-7],[0-9]|MacBook[\d,]+|MacBookPro([1-9]|1[0-4]),[0-9])$" THEN "Ventura"
-		ELSE "Sonoma"
+		WHEN computers_denormalized.model_identifier REGEXP "^(MacPro[1-6],[0-9]|iMac([1-9]|1[0-8]),[0-9]|Macmini[1-7],[0-9]|MacBookAir[1-8],[0-9]|MacBookPro([1-9]|1[0-4]),[0-9])$" THEN "Sonoma"
+		ELSE "Sequoia"
 	END AS "Latest Major OS Supported",
 	CASE
 		WHEN (
@@ -51,7 +52,10 @@ SELECT
 				computers_denormalized.model_identifier REGEXP "^(MacPro[1-6],[0-9]|iMac([1-9]|1[0-8]),[0-9]|(Macmini|MacBookAir)[1-7],[0-9]|MacBook[\d,]+|MacBookPro([1-9]|1[0-4]),[0-9])$"
 				AND computers_denormalized.operating_system_version LIKE "13.%"
 			OR
-				computers_denormalized.operating_system_version LIKE "14.%"
+				computers_denormalized.model_identifier REGEXP "^(MacPro[1-6],[0-9]|iMac([1-9]|1[0-8]),[0-9]|Macmini[1-7],[0-9]|MacBookAir[1-8],[0-9]|MacBookPro([1-9]|1[0-4]),[0-9])$"
+				AND computers_denormalized.operating_system_version LIKE "14.%"
+			OR
+				computers_denormalized.operating_system_version LIKE "15.%"
 		) THEN "True"
 		ELSE "False"
 	END AS "Latest Major OS Installed",
@@ -351,7 +355,7 @@ WHERE
 --   Remove the last AND condition to see all failed Renew MDM Profile Commands
 SELECT
 	mac_denorm.computer_id AS "Computer ID",
-	IF (sites_macs.site_name IS NOT NULL, sites_macs.site_name, "None") AS `Site`,
+	IF(sites_macs.site_name IS NOT NULL, sites_macs.site_name, "None") AS "Site",
 	IF(mac_denorm.is_managed = 1, "True", "False") AS "Managed",
 	error_code AS "Error Code",
 	error_domain AS "Error Domain",
diff --git a/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Mobile Device Details.sql b/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Mobile Device Details.sql
index d8d9240..55e3e9a 100644
--- a/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Mobile Device Details.sql	
+++ b/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Mobile Device Details.sql	
@@ -22,7 +22,8 @@ SELECT
 		WHEN mobile_devices_denormalized.model_identifier REGEXP "^(iPad4,[0-7]|iPhone[6-7],[0-9])$" THEN "iOS 12"
 		WHEN mobile_devices_denormalized.model_identifier REGEXP "^(iPod9,[0-9]|iPad4,[8-9]|iPad5,[0-9]|iPhone[8-9],[0-9])$" THEN "iOS 15"
 		WHEN mobile_devices_denormalized.model_identifier REGEXP "^(iPad6,[0-9]|iPhone10,[0-9])$" THEN "iOS 16"
-		ELSE "iOS 17"
+		WHEN mobile_devices_denormalized.model_identifier REGEXP "^(iPad7,[1-6]|iPhone10,[0-9])$" THEN "iOS 17"
+		ELSE "iOS 18"
 	END AS "Latest Major OS Supported",
 	CASE
 		WHEN (
@@ -41,7 +42,10 @@ SELECT
 				mobile_devices_denormalized.model_identifier REGEXP "^(iPad6,[0-9]|iPhone10,[0-9])$"
 				AND mobile_devices_denormalized.os_version LIKE "16.%"
 			OR
-				mobile_devices_denormalized.os_version LIKE "17.%"
+				mobile_devices_denormalized.model_identifier REGEXP "^(iPad7,[1-6]|iPhone10,[0-9])$"
+				AND mobile_devices_denormalized.os_version LIKE "17.%"
+			OR
+				mobile_devices_denormalized.os_version LIKE "18.%"
 		) THEN "True"
 		ELSE "False"
 	END AS "Running Latest Major OS",