diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/employeeperUnit.query.xml b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/employeeperUnit.query.xml
index ba8a15c67..38016fa62 100644
--- a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/employeeperUnit.query.xml
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/employeeperUnit.query.xml
@@ -7,6 +7,7 @@
                 <columns>
                    <column columnName="employeeId">
                         <fk>
+                            <fkFolderPath>/ONPRC/Admin/Compliance</fkFolderPath>
                             <fkDbSchema>ehr_compliancedb</fkDbSchema>
                             <fkTable>employees</fkTable>
                             <fkColumnName>employeeId</fkColumnName>
diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js
index 7f2a92c15..afe078fcf 100644
--- a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js
+++ b/ONPRC_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/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/requirementsperemployee.js b/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/requirementsperemployee.js
index 76a800812..bb0c49148 100644
--- a/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/requirementsperemployee.js
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/requirementsperemployee.js
@@ -5,6 +5,7 @@
 */
 
 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, 'onprc_ehr_compliancedb', 'requirementsperemployee');
 
@@ -24,17 +25,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']);
 }
diff --git a/onprc_ssu/resources/queries/onprc_ssu/schedule.js b/onprc_ssu/resources/queries/onprc_ssu/schedule.js
index 4a69359e4..810189a79 100644
--- a/onprc_ssu/resources/queries/onprc_ssu/schedule.js
+++ b/onprc_ssu/resources/queries/onprc_ssu/schedule.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, 'onprc_ssu', 'schedule');
 
@@ -27,17 +28,5 @@ function beforeUpdate(row, oldRow, errors){
 }
 
 function beforeUpsert(row, errors){
-    var lookupFields = ['projectName'];
-    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, ['projectName']);
 }
\ No newline at end of file