diff --git a/app/src/Model/Table/AttributesTable.php b/app/src/Model/Table/AttributesTable.php
index 57b5dd44..b8cf4c63 100644
--- a/app/src/Model/Table/AttributesTable.php
+++ b/app/src/Model/Table/AttributesTable.php
@@ -90,12 +90,12 @@ public function initialize(array $config): void {
   public function install(int $matchgridId) {
     // First create an "official" attribute group, if one doesn't already exist
 
-    $groupObj = $this->AttributeGroups->find('all', [
-      'conditions' => [
-        'matchgrid_id'  => $matchgridId,
-        'name'          => 'official'
-      ]])
-      ->first();
+    $groupObj = $this->AttributeGroups->find()
+                                      ->where([
+                                        'matchgrid_id'  => $matchgridId,
+                                        'name'          => 'official'
+                                      ])
+                                      ->first();
     
     if(empty($groupObj)) {
       // No existing Attribute Group, create one
@@ -183,12 +183,12 @@ public function install(int $matchgridId) {
     ];
 
     foreach($attrs as $attr) {
-      $attrObj = $this->find('all', [
-        'conditions' => [
-          'matchgrid_id'  => $matchgridId,
-          'name'          => $attr['name']
-        ]])
-        ->first();
+      $attrObj = $this->find()
+                      ->where([
+                        'matchgrid_id'  => $matchgridId,
+                        'name'          => $attr['name']
+                      ])
+                      ->first();
       
       if(empty($attrObj)) {
         // No existing Attribute, create one
@@ -299,6 +299,7 @@ public function validationDefault(Validator $validator): Validator {
     );
     $validator->allowEmptyString('search_distance');
 
+// CO-2181 do we even want this anymore?
     $validator->add(
       'search_exact',
       'toggle',