diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js
index 436357c8f..80e5e380c 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js
@@ -24,15 +24,15 @@ function beforeDelete(row, errors){
     var fields = ['categoryname'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'category', row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'category', row[fieldName], 'employeecategory')){
             addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table');
         }
 
-        if (helper.verifyNotUsed('ehr_compliancedb', 'requirementspercategory', 'category', row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'requirementspercategory', 'category', row[fieldName], 'employeecategory')){
             addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the requirementspercategory table');
         }
 
-        if (helper.verifyNotUsed('ehr_compliancedb', 'sopbycategory', 'category', row[fieldName])){
+        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');
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeelocations.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeelocations.js
index d776a1de3..d7a91cd3d 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeelocations.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeelocations.js
@@ -22,7 +22,7 @@ function beforeDelete(row, errors){
     var fields = ['location'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'location', row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'location', row[fieldName], 'employeelocations')){
             errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table'];
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js
index d1cd1707b..99490d1b9 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js
@@ -63,14 +63,14 @@ function beforeDelete(row, errors){
         query = queries[j];
         for (var i=0;i<fields.length;i++){
             fieldName = fields[i];
-            if (helper.verifyNotUsed('ehr_compliancedb', query, 'employeeid', row[fieldName])){
+            if (helper.verifyNotUsed('ehr_compliancedb', query, 'employeeid', row[fieldName], 'employees')){
                 addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);
             }
         }
     }
 
     //also check trainer
-    if (helper.verifyNotUsed('ehr_compliancedb', 'completiondates', 'trainer', row[fieldName])){
+    if (helper.verifyNotUsed('ehr_compliancedb', 'completiondates', 'trainer', row[fieldName], 'employees')){
         addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table completiondates');
     }
 }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetitles.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetitles.js
index 56a015a18..f914e3f87 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetitles.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetitles.js
@@ -22,7 +22,7 @@ function beforeDelete(row, errors){
     var fields = ['title'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', fieldName, row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', fieldName, row[fieldName], 'employeetitles')){
             errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table'];
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetypes.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetypes.js
index 7281907ad..1dc519c0a 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetypes.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetypes.js
@@ -22,7 +22,7 @@ function beforeDelete(row, errors){
     var fields = ['type'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', fieldName, row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', fieldName, row[fieldName], 'employeetypes')){
             errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table'];
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js
index 1572cc6f1..32eb5862a 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js
@@ -63,7 +63,7 @@ function beforeDelete(row, errors){
         query = queries[j];
         for (var i=0;i<fields.length;i++){
             fieldName = fields[i];
-            if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName])){
+            if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName], 'requirements')){
                 addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);
             }
         }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementtype.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementtype.js
index ca4246b32..bbd46093d 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementtype.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementtype.js
@@ -22,7 +22,7 @@ function beforeDelete(row, errors){
     var fields = ['type'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'requirements', fieldName, row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'requirements', fieldName, row[fieldName], 'requirementtype')){
             errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the requirements table'];
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js
index 26fbea6ba..9e5482744 100644
--- a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js
+++ b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js
@@ -26,7 +26,7 @@ function beforeDelete(row, errors){
         query = queries[j];
         for (var i=0;i<fields.length;i++){
             fieldName = fields[i];
-            if (helper.verifyNotUsed('ehr_compliancedb', query, 'unit', row[fieldName])){
+            if (helper.verifyNotUsed('ehr_compliancedb', query, 'unit', row[fieldName], 'unit_names')){
                 addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);
             }
         }
diff --git a/ehr/resources/queries/ehr_lookups/procedures.js b/ehr/resources/queries/ehr_lookups/procedures.js
index f88cd217d..60f385a93 100644
--- a/ehr/resources/queries/ehr_lookups/procedures.js
+++ b/ehr/resources/queries/ehr_lookups/procedures.js
@@ -6,15 +6,17 @@
 
 var console = require("console");
 var LABKEY = require("labkey");
+var triggers = require("ehr/triggers");
+triggers.initScript(this);
+var EHR = triggers.EHR;
 
-var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_lookups', 'procedures');
+var lookupValidationHelper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_lookups', 'procedures');
 
-
-function beforeDelete(row, errors){
-    if (helper.verifyNotUsed('study', 'encounters', 'procedureid', row['rowid'])){
+EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.BEFORE_DELETE, 'ehr_lookups', 'procedures', function(helper, scriptErrors, row, oldRow){
+    if (lookupValidationHelper.verifyNotUsed('study', 'encounters', 'procedureid', row['rowid'], 'procedures')) {
         addError(errors, 'name', 'Cannot delete row with ID: ' + row['rowid'] + ' because it is referenced by the table encounters.  You should inactivate this item instead.');
     }
-}
+});
 
 function addError(errors, fieldName, msg){
     if (!errors[fieldName])