diff --git a/app/src/Model/Table/ApiUsersTable.php b/app/src/Model/Table/ApiUsersTable.php
index 44d7f3f5a..8a91c86f5 100644
--- a/app/src/Model/Table/ApiUsersTable.php
+++ b/app/src/Model/Table/ApiUsersTable.php
@@ -188,14 +188,14 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('matchgrid_id');
+    $validator->allowEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'system_of_record_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('system_of_record_id');
+    $validator->allowEmptyFor('system_of_record_id', Validator::EMPTY_NULL);
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/AttributeGroupsTable.php b/app/src/Model/Table/AttributeGroupsTable.php
index 2687f4631..27b31fae6 100644
--- a/app/src/Model/Table/AttributeGroupsTable.php
+++ b/app/src/Model/Table/AttributeGroupsTable.php
@@ -69,14 +69,14 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 32 ] ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
     
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/AttributeMappingsTable.php b/app/src/Model/Table/AttributeMappingsTable.php
index ab9d3a170..33b560c6b 100644
--- a/app/src/Model/Table/AttributeMappingsTable.php
+++ b/app/src/Model/Table/AttributeMappingsTable.php
@@ -136,7 +136,7 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'maxLength', 80 ],
         'message' => __('match.er.val.length', [80]) ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
     
     $validator->add(
       'value',
@@ -144,14 +144,14 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'maxLength', 80 ],
         'message' => __('match.er.val.length', [80]) ]
     );
-    $validator->notEmpty('description');
+    $validator->notEmptyrString('description');
     
     $validator->add(
       'attribute_map_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('attribute_map_id');
+    $validator->notEmptyFor('attribute_map_id', Validator::EMPTY_NULL);
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/AttributeMapsTable.php b/app/src/Model/Table/AttributeMapsTable.php
index f35d09b7b..3df136888 100644
--- a/app/src/Model/Table/AttributeMapsTable.php
+++ b/app/src/Model/Table/AttributeMapsTable.php
@@ -76,7 +76,7 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'maxLength', 64 ],
         'message' => __('match.er.val.length', [64]) ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
     
     $validator->add(
       'description',
@@ -84,14 +84,14 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'maxLength', 128 ],
         'message' => __('match.er.val.length', [128]) ]
     );
-    $validator->allowEmpty('description');
+    $validator->allowEmptyString('description');
     
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/AttributesTable.php b/app/src/Model/Table/AttributesTable.php
index 2e1e27d11..96b1e4b01 100644
--- a/app/src/Model/Table/AttributesTable.php
+++ b/app/src/Model/Table/AttributesTable.php
@@ -99,14 +99,14 @@ public function validationDefault(Validator $validator) {
       [ 'rule'     => [ 'validateSqlIdentifier' ],
         'provider' => 'table' ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
     
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'description',
@@ -114,7 +114,7 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'maxLength', 128 ],
         'message' => __('match.er.val.length', [128]) ]
     );
-    $validator->allowEmpty('description');
+    $validator->allowEmptyString('description');
     
     $validator->add(
       'api_name',
@@ -122,49 +122,49 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'maxLength', 128 ],
         'message' => __('match.er.val.length', [128]) ]
     );
-    $validator->notEmpty('api_name');
+    $validator->notEmptyString('api_name');
     
     $validator->add(
       'index_display',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('index_display');
+    $validator->notEmptyFor('index_display', Validator::EMPTY_NULL);
     
     $validator->add(
       'attribute_group_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('attribute_group_id');
+    $validator->allowEmptyFor('attribute_group_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'alphanumeric',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('alphanumeric');
+    $validator->notEmptyFor('alphanumeric', Validator::EMPTY_NULL);
 
     $validator->add(
       'case_sensitive',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('case_sensitive');
+    $validator->notEmptyFor('case_sensitive', Validator::EMPTY_NULL);
 
     $validator->add(
       'invalidates',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('invalidates');
+    $validator->notEmptyFor('invalidates', Validator::EMPTY_NULL);
 
     $validator->add(
       'null_equivalents',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('null_equivalents');
+    $validator->notEmptyFor('null_equivalents', Validator::EMPTY_NULL);
     
     $validator->add(
       'search_distance',
@@ -172,14 +172,14 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'range', 1, 9 ],
         'message' => __('match.er.val.range', [1, 9]) ]
     );
-    $validator->allowEmpty('search_distance');
+    $validator->allowEmptyString('search_distance');
 
     $validator->add(
       'search_exact',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('search_exact');
+    $validator->notEmptyFor('search_exact', Validator::EMPTY_NULL);
 
     $validator->add(
       'search_substr_from',
@@ -187,7 +187,7 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'range', 0, 128 ],
         'message' => __('match.er.val.range', [0, 128]) ]
     );
-    $validator->allowEmpty('search_substr_from');
+    $validator->allowEmptyString('search_substr_from');
 
     $validator->add(
       'search_substr_for',
@@ -195,14 +195,14 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'range', 1, 128 ],
         'message' => __('match.er.val.range', [1, 128]) ]
     );
-    $validator->allowEmpty('search_substr_for');
+    $validator->allowEmptyString('search_substr_for');
     
     $validator->add(
       'attribute_map_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('attribute_map_id');
+    $validator->allowEmptyFor('attribute_map_id', Validator::EMPTY_NULL);
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/MatchgridSettingsTable.php b/app/src/Model/Table/MatchgridSettingsTable.php
index 27d17f643..a3f3f93d8 100644
--- a/app/src/Model/Table/MatchgridSettingsTable.php
+++ b/app/src/Model/Table/MatchgridSettingsTable.php
@@ -184,7 +184,7 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'referenceid_method',
@@ -194,21 +194,21 @@ public function validationDefault(Validator $validator) {
         ReferenceIdEnum::UUID
       ] ] ]
     );
-    $validator->notEmpty('referenceid_method');
+    $validator->notEmptyString('referenceid_method');
     
     $validator->add(
       'referenceid_start',
       'content',
       [ 'rule' => [ 'range', 1, null ] ]
     );
-    $validator->allowEmpty('referenceid_start');
+    $validator->allowEmptyFor('referenceid_start', Validator::EMPTY_NULL);
     
     $validator->add(
       'referenceid_prefix',
       'content',
       [ 'rule' => [ 'maxLength', 32 ] ]
     );
-    $validator->allowEmpty('referenceid_prefix');
+    $validator->allowEmptyString('referenceid_prefix');
     
     $validator->add(
       'notification_email',
@@ -220,7 +220,7 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'email' ]
     );
-    $validator->allowEmpty('notification_email');
+    $validator->allowEmptyString('notification_email');
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/MatchgridsTable.php b/app/src/Model/Table/MatchgridsTable.php
index 42c05de94..99003e239 100644
--- a/app/src/Model/Table/MatchgridsTable.php
+++ b/app/src/Model/Table/MatchgridsTable.php
@@ -179,14 +179,14 @@ public function validationDefault(Validator $validator) {
       [ 'rule'     => [ 'validateSqlIdentifier' ],
         'provider' => 'table' ]
     );
-    $validator->notEmpty('table_name');
+    $validator->notEmptyString('table_name');
     
     $validator->add(
       'description',
       'length',
       [ 'rule' => [ 'maxLength', 128 ] ]
     );
-    $validator->allowEmpty('description');
+    $validator->allowEmptyString('description');
     
     $validator->add(
       'status',
@@ -196,7 +196,7 @@ public function validationDefault(Validator $validator) {
         StatusEnum::Suspended
       ] ] ]
     );
-    $validator->notEmpty('status');
+    $validator->notEmptyString('status');
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/MetaTable.php b/app/src/Model/Table/MetaTable.php
index 7027b549a..512c67810 100644
--- a/app/src/Model/Table/MetaTable.php
+++ b/app/src/Model/Table/MetaTable.php
@@ -71,7 +71,7 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 16 ] ]
     );
-    $validator->notEmpty('upgrade_version');
+    $validator->notEmptyString('upgrade_version');
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/PermissionsTable.php b/app/src/Model/Table/PermissionsTable.php
index 5c15d470b..ef972f243 100644
--- a/app/src/Model/Table/PermissionsTable.php
+++ b/app/src/Model/Table/PermissionsTable.php
@@ -97,14 +97,14 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 128 ] ]
     );
-    $validator->notEmpty('username');
+    $validator->notEmptyString('username');
     
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('matchgrid_id');
+    $validator->allowEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'permission',
@@ -131,7 +131,7 @@ public function validationDefault(Validator $validator) {
       'require' => 'matchgrid_id',
       'label' => __('match.ct.matchgrids', [1])
     ]);
-    $validator->notEmpty('permission');
+    $validator->notEmptyString('permission');
     
     return $validator; 
   }
diff --git a/app/src/Model/Table/RuleAttributesTable.php b/app/src/Model/Table/RuleAttributesTable.php
index c9ff90924..11e977a52 100644
--- a/app/src/Model/Table/RuleAttributesTable.php
+++ b/app/src/Model/Table/RuleAttributesTable.php
@@ -98,21 +98,21 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('rule_id');
+    $validator->notEmptyFor('rule_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'attribute_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('attribute_id');
+    $validator->notEmptyFor('attribute_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'crosscheck_attribute_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('crosscheck_attribute_id');
+    $validator->allowEmptyFor('crosscheck_attribute_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'search_type',
@@ -125,22 +125,22 @@ public function validationDefault(Validator $validator) {
         SearchTypeEnum::Substring
       ] ] ]
     );
-    $validator->notEmpty('search_type');
+    $validator->notEmptyString('search_type');
     
     $validator->add(
       'required',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->allowEmpty('required');
+    $validator->allowEmptyFor('required', Validator::EMPTY_NULL);
     
     $validator->add(
       'match_empty',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->allowEmpty('match_empty');
-    
+    $validator->allowEmptyFor('match_empty', Validator::EMPTY_NULL);
+
     return $validator; 
   }
 }
\ No newline at end of file
diff --git a/app/src/Model/Table/RulesTable.php b/app/src/Model/Table/RulesTable.php
index 618044f5b..f1c0fff6d 100644
--- a/app/src/Model/Table/RulesTable.php
+++ b/app/src/Model/Table/RulesTable.php
@@ -85,21 +85,21 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 32 ] ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
     
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'description',
       'length',
       [ 'rule' => [ 'maxLength', 128 ] ]
     );
-    $validator->allowEmpty('description');
+    $validator->allowEmptyString('description');
     
     $validator->add(
       'confidence_mode',
@@ -110,7 +110,7 @@ public function validationDefault(Validator $validator) {
         ConfidenceModeEnum::Suspended
       ] ] ]
     );
-    $validator->notEmpty('confidence_mode');
+    $validator->notEmptyString('confidence_mode');
     
     $validator->add(
       'ordr',
diff --git a/app/src/Model/Table/SystemsOfRecordTable.php b/app/src/Model/Table/SystemsOfRecordTable.php
index 5fbb6347c..9d63f80b5 100644
--- a/app/src/Model/Table/SystemsOfRecordTable.php
+++ b/app/src/Model/Table/SystemsOfRecordTable.php
@@ -81,14 +81,14 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 80 ] ]
     );
-    $validator->notEmpty('label');
+    $validator->notEmptyString('label');
     
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
     
     $validator->add(
       'resolution_mode',
@@ -98,7 +98,7 @@ public function validationDefault(Validator $validator) {
         ResolutionModeEnum::Interactive
       ] ] ]
     );
-    $validator->notEmpty('resolution_mode');
+    $validator->notEmptyString('resolution_mode');
     
     $validator->add(
       'notification_email',
@@ -110,7 +110,7 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'email' ]
     );
-    $validator->allowEmpty('notification_email');
+    $validator->allowEmptyString('notification_email');
     
     return $validator; 
   }