diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/completiondates.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/completiondates.js
index 5dcf17811..41d824e0a 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/completiondates.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/completiondates.js
@@ -6,6 +6,7 @@
 
 var console = require("console");
 var LABKEY = require("labkey");
+var ldkUtils = require("ldk/Utils").LDK.Server.Utils;
 
 var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'completiondates');
 
@@ -27,17 +28,5 @@ function beforeUpdate(row, oldRow, errors){
 }
 
 function beforeUpsert(row, errors){
-    var lookupFields = ['employeeid', 'requirementname'];
-    for (var i=0;i<lookupFields.length;i++){
-        var f = lookupFields[i];
-        var val = row[f];
-        if (!LABKEY.ExtAdapter.isEmpty(val)){
-            var normalizedVal = helper.getLookupValue(val, f);
-
-            if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
-                errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
-            else
-                row[f] = normalizedVal;  //cache value for purpose of normalizing case
-        }
-    }
+    ldkUtils.normalizeLookupFields(helper, row, errors, ['employeeid', 'requirementname']);
 }
\ No newline at end of file
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js
index 80e5e380c..9e941a582 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js
@@ -16,6 +16,7 @@ function afterUpdate(row, oldRow, errors){
             helper.cascadeUpdate('ehr_compliancedb', 'employees', 'category', row[fieldName], oldRow[fieldName]);
             helper.cascadeUpdate('ehr_compliancedb', 'requirementspercategory', 'category', row[fieldName], oldRow[fieldName]);
             helper.cascadeUpdate('ehr_compliancedb', 'sopbycategory', 'category', row[fieldName], oldRow[fieldName]);
+            helper.cascadeUpdate('ehr_compliancedb', 'employeeperunit', 'category', row[fieldName], oldRow[fieldName]);
         }
     }
 }
@@ -35,6 +36,10 @@ function beforeDelete(row, errors){
         if (helper.verifyNotUsed('ehr_compliancedb', 'sopbycategory', 'category', row[fieldName], 'employeecategory')){
             addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the sopbycategory table');
         }
+
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employeeperunit', 'category', row[fieldName], 'employeecategory')){
+            addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employeeperunit table');
+        }
     }
 }
 
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeeperunit.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeeperunit.js
new file mode 100644
index 000000000..e5ecdd530
--- /dev/null
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeeperunit.js
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2026 LabKey Corporation
+*
+* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+*/
+
+var LABKEY = require("labkey");
+var ldkUtils = require("ldk/Utils").LDK.Server.Utils;
+
+var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'employeeperunit');
+
+function beforeInsert(row, errors){
+    beforeUpsert(row, errors);
+}
+
+function beforeUpdate(row, oldRow, errors){
+    //NOTE: this is designed to merge the old row into the new one.
+    for (var prop in oldRow){
+        if(!row.hasOwnProperty(prop) && LABKEY.ExtAdapter.isDefined(oldRow[prop])){
+            row[prop] = oldRow[prop];
+        }
+    }
+
+    beforeUpsert(row, errors);
+}
+
+function beforeUpsert(row, errors){
+    ldkUtils.normalizeLookupFields(helper, row, errors, ['employeeid', 'unit', 'category']);
+}
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeerequirementexemptions.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeerequirementexemptions.js
index 4fe4f2ff0..4b9ec7515 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeerequirementexemptions.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeerequirementexemptions.js
@@ -6,6 +6,7 @@
 
 var console = require("console");
 var LABKEY = require("labkey");
+var ldkUtils = require("ldk/Utils").LDK.Server.Utils;
 
 var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'employeerequirementexemptions');
 
@@ -27,17 +28,5 @@ function beforeUpdate(row, oldRow, errors){
 }
 
 function beforeUpsert(row, errors){
-    var lookupFields = ['employeeid', 'requirementname'];
-    for (var i=0;i<lookupFields.length;i++){
-        var f = lookupFields[i];
-        var val = row[f];
-        if (!LABKEY.ExtAdapter.isEmpty(val)){
-            var normalizedVal = helper.getLookupValue(val, f);
-
-            if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
-                errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
-            else
-                row[f] = normalizedVal;  //cache value for purpose of normalizing case
-        }
-    }
+    ldkUtils.normalizeLookupFields(helper, row, errors, ['employeeid', 'requirementname']);
 }
\ No newline at end of file
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js
index 99490d1b9..1a276343a 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js
@@ -6,6 +6,7 @@
 
 var console = require("console");
 var LABKEY = require("labkey");
+var ldkUtils = require("ldk/Utils").LDK.Server.Utils;
 
 var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'employees');
 
@@ -27,19 +28,7 @@ function beforeUpdate(row, oldRow, errors){
 }
 
 function beforeUpsert(row, errors){
-    var lookupFields = ['type', 'title', 'category', 'unit', 'location'];
-    for (var i=0;i<lookupFields.length;i++){
-        var f = lookupFields[i];
-        var val = row[f];
-        if (!LABKEY.ExtAdapter.isEmpty(val)){
-            var normalizedVal = helper.getLookupValue(val, f);
-
-            if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
-                errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
-            else
-                row[f] = normalizedVal;  //cache value for purpose of normalizing case
-        }
-    }
+    ldkUtils.normalizeLookupFields(helper, row, errors, ['type', 'title', 'category', 'unit', 'location']);
 }
 
 function afterUpdate(row, oldRow, errors){
@@ -48,6 +37,7 @@ function afterUpdate(row, oldRow, errors){
         fieldName = fields[i];
         if (row[fieldName] && oldRow[fieldName] && row[fieldName] != oldRow[fieldName]){
             helper.cascadeUpdate('ehr_compliancedb', 'employeerequirementexemptions', 'employeeid', row[fieldName], oldRow[fieldName]);
+            helper.cascadeUpdate('ehr_compliancedb', 'employeeperunit', 'employeeid', row[fieldName], oldRow[fieldName]);
             helper.cascadeUpdate('ehr_compliancedb', 'requirementsperemployee', 'employeeid', row[fieldName], oldRow[fieldName]);
             helper.cascadeUpdate('ehr_compliancedb', 'sopdates', 'employeeid', row[fieldName], oldRow[fieldName]);
             helper.cascadeUpdate('ehr_compliancedb', 'completiondates', 'employeeid', row[fieldName], oldRow[fieldName]);
@@ -57,7 +47,7 @@ function afterUpdate(row, oldRow, errors){
 }
 
 function beforeDelete(row, errors){
-    var queries = ['employeerequirementexemptions', 'requirementsperemployee', 'sopdates', 'completiondates'], query;
+    var queries = ['employeerequirementexemptions', 'employeeperunit', 'requirementsperemployee', 'sopdates', 'completiondates'], query;
     var fields = ['employeeid'], fieldName;
     for (var j=0;j<queries.length;j++){
         query = queries[j];
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js
index 32eb5862a..3a47a8357 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js
@@ -6,6 +6,7 @@
 
 var console = require("console");
 var LABKEY = require("labkey");
+var ldkUtils = require("ldk/Utils").LDK.Server.Utils;
 
 var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'requirements');
 
@@ -27,19 +28,7 @@ function beforeUpdate(row, oldRow, errors){
 }
 
 function beforeUpsert(row, errors){
-    var lookupFields = ['type'];
-    for (var i=0;i<lookupFields.length;i++){
-        var f = lookupFields[i];
-        var val = row[f];
-        if (!LABKEY.ExtAdapter.isEmpty(val)){
-            var normalizedVal = helper.getLookupValue(val, f);
-
-            if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
-                errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
-            else
-                row[f] = normalizedVal;  //cache value for purpose of normalizing case
-        }
-    }
+    ldkUtils.normalizeLookupFields(helper, row, errors, ['type']);
 }
 
 function afterUpdate(row, oldRow, errors){
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementspercategory.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementspercategory.js
index 1eebec1e4..2d92e60c6 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementspercategory.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementspercategory.js
@@ -6,6 +6,7 @@
 
 var console = require("console");
 var LABKEY = require("labkey");
+var ldkUtils = require("ldk/Utils").LDK.Server.Utils;
 
 var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'requirementspercategory');
 
@@ -27,17 +28,5 @@ function beforeUpdate(row, oldRow, errors){
 }
 
 function beforeUpsert(row, errors){
-    var lookupFields = ['requirementname', 'category', 'unit'];
-    for (var i=0;i<lookupFields.length;i++){
-        var f = lookupFields[i];
-        var val = row[f];
-        if (!LABKEY.ExtAdapter.isEmpty(val)){
-            var normalizedVal = helper.getLookupValue(val, f);
-
-            if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
-                errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
-            else
-                row[f] = normalizedVal;  //cache value for purpose of normalizing case
-        }
-    }
+    ldkUtils.normalizeLookupFields(helper, row, errors, ['requirementname', 'category', 'unit']);
 }
\ No newline at end of file
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementsperemployee.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementsperemployee.js
index 63490af1d..937a86c1e 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementsperemployee.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementsperemployee.js
@@ -6,6 +6,7 @@
 
 var console = require("console");
 var LABKEY = require("labkey");
+var ldkUtils = require("ldk/Utils").LDK.Server.Utils;
 
 var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'requirementsperemployee');
 
@@ -27,17 +28,5 @@ function beforeUpdate(row, oldRow, errors){
 }
 
 function beforeUpsert(row, errors){
-    var lookupFields = ['employeeid', 'requirementname'];
-    for (var i=0;i<lookupFields.length;i++){
-        var f = lookupFields[i];
-        var val = row[f];
-        if (!LABKEY.ExtAdapter.isEmpty(val)){
-            var normalizedVal = helper.getLookupValue(val, f);
-
-            if (LABKEY.ExtAdapter.isEmpty(normalizedVal))
-                errors[f] = 'Unknown value for field: ' + f + '. Value was: ' + val;
-            else
-                row[f] = normalizedVal;  //cache value for purpose of normalizing case
-        }
-    }
+    ldkUtils.normalizeLookupFields(helper, row, errors, ['employeeid', 'requirementname']);
 }
\ No newline at end of file
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/sopdates.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/sopdates.js
new file mode 100644
index 000000000..c611c1660
--- /dev/null
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/sopdates.js
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2026 LabKey Corporation
+*
+* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+*/
+
+var LABKEY = require("labkey");
+var ldkUtils = require("ldk/Utils").LDK.Server.Utils;
+
+var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_compliancedb', 'sopdates');
+
+function beforeInsert(row, errors){
+    beforeUpsert(row, errors);
+}
+
+function beforeUpdate(row, oldRow, errors){
+    //NOTE: this is designed to merge the old row into the new one.
+    for (var prop in oldRow){
+        if(!row.hasOwnProperty(prop) && LABKEY.ExtAdapter.isDefined(oldRow[prop])){
+            row[prop] = oldRow[prop];
+        }
+    }
+
+    beforeUpsert(row, errors);
+}
+
+function beforeUpsert(row, errors){
+    //sopid is omitted deliberately: its fk to sops is commented out in ehr_compliancedb.xml, so getLookupValue would return null and reject every row
+    ldkUtils.normalizeLookupFields(helper, row, errors, ['employeeid']);
+}
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js
index 9e5482744..88b2409d3 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js
@@ -15,12 +15,13 @@ function afterUpdate(row, oldRow, errors){
         if (row[fieldName] && oldRow[fieldName] && row[fieldName] != oldRow[fieldName]){
             helper.cascadeUpdate('ehr_compliancedb', 'requirementspercategory', 'unit', row[fieldName], oldRow[fieldName]);
             helper.cascadeUpdate('ehr_compliancedb', 'employees', 'unit', row[fieldName], oldRow[fieldName]);
+            helper.cascadeUpdate('ehr_compliancedb', 'employeeperunit', 'unit', row[fieldName], oldRow[fieldName]);
         }
     }
 }
 
 function beforeDelete(row, errors){
-    var queries = ['requirementspercategory', 'employees'], query;
+    var queries = ['requirementspercategory', 'employees', 'employeeperunit'], query;
     var fields = ['unit'], fieldName;
     for (var j=0;j<queries.length;j++){
         query = queries[j];