diff --git a/server/AyaNova/DataList/UnitDataList.cs b/server/AyaNova/DataList/UnitDataList.cs
index b31139b2..2a87b0c5 100644
--- a/server/AyaNova/DataList/UnitDataList.cs
+++ b/server/AyaNova/DataList/UnitDataList.cs
@@ -24,7 +24,7 @@ LEFT JOIN LATERAL
 		FROM AWORKORDER
 		LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
 		LEFT JOIN AWORKORDERITEMUNIT ON AWORKORDERITEM.ID = AWORKORDERITEMUNIT.WORKORDERITEMID
-		WHERE AWORKORDERITEMUNIT.ID = AMAINUNIT.ID
+		WHERE AWORKORDERITEMUNIT.UNITID = AMAINUNIT.ID
 		ORDER BY AWORKORDER.SERVICEDATE DESC 
 		LIMIT 1) AS LWO ON TRUE";
 
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 7ba0ab7f..42a5445b 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -23,7 +23,7 @@ namespace AyaNova.Util
         private const int DESIRED_SCHEMA_LEVEL = 1;
 
         internal const long EXPECTED_COLUMN_COUNT = 1301;
-        internal const long EXPECTED_INDEX_COUNT = 145;
+        internal const long EXPECTED_INDEX_COUNT = 147;
         internal const long EXPECTED_CHECK_CONSTRAINTS = 517;
         internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 193;
         internal const long EXPECTED_VIEWS = 11;
@@ -31,7 +31,8 @@ namespace AyaNova.Util
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!!
 
-        /////////////////////////////////////////////////////////////////        C1301:I145:CC517:FC193:V11:R2
+        /////////////////////////////////////////////////////////////////        C1301:I147:CC517:FC193:V11:R2
+
 
 
         /*