diff --git a/app/src/Lib/Traits/SearchFilterTrait.php b/app/src/Lib/Traits/SearchFilterTrait.php
index e0d9b2e95..70ffd5e18 100644
--- a/app/src/Lib/Traits/SearchFilterTrait.php
+++ b/app/src/Lib/Traits/SearchFilterTrait.php
@@ -68,7 +68,8 @@ public function getSearchableAttributes(string $controller, string $vv_tz=null):
           'type' => 'string', // XXX for now - this needs to be looked up.
           'label' => \App\Lib\Util\StringUtilities::columnKey($fieldName, $field, $vv_tz, true),
           'active' => isset($f['active']) ? $f['active'] : true,
-          'model' => $f['model']
+          'model' => $f['model'],
+          'order' => $f['order']
         ];
       }
     }
@@ -93,7 +94,8 @@ public function getSearchableAttributes(string $controller, string $vv_tz=null):
       $this->searchFilters[$column] = [
         'type' => $type,
         'label' => \App\Lib\Util\StringUtilities::columnKey($modelname, $column, $vv_tz, true),
-        'active' => $fieldIsActive
+        'active' => $fieldIsActive,
+        'order' => 99 // this is the default
       ];
 
       // For the date fields we search ranges
diff --git a/app/src/Lib/Util/StringUtilities.php b/app/src/Lib/Util/StringUtilities.php
index 0b3e47aca..945456eb9 100644
--- a/app/src/Lib/Util/StringUtilities.php
+++ b/app/src/Lib/Util/StringUtilities.php
@@ -57,10 +57,16 @@ public static function classNameToForeignKey(string $className): string {
 
   public static function columnKey($modelsName, $c, $tz=null, $useCustomClMdlLabel=false): string {
     if(strpos($c, "_id", strlen($c)-3)) {
+      $postfix = "";
+      if($c == "parent_id") {
+        // This means we are working with a model that implements a Tree behavior
+        $postfix = " ({$modelsName})";
+      }
+
       // Key is of the form field_id, use .ct label instead
       $k = self::foreignKeyToClassName($c);
 
-      return __d('controller', $k, [1]);
+      return __d('controller', $k, [1])  . $postfix;
     }
 
     // Look for a model specific key first
diff --git a/app/src/Model/Table/PeopleTable.php b/app/src/Model/Table/PeopleTable.php
index 36c338a26..ba79f5098 100644
--- a/app/src/Model/Table/PeopleTable.php
+++ b/app/src/Model/Table/PeopleTable.php
@@ -437,9 +437,9 @@ public function marshalProvisioningData(int $id): array {
 
       $identifiers = [];
 
-      foreach($ret['data']->identifiers as $id) {
-        if($id->status == SuspendableStatusEnum::Active) {
-          $identifiers[] = $id;
+      foreach($ret['data']->identifiers as $ident) {
+        if($ident->status == SuspendableStatusEnum::Active) {
+          $identifiers[] = $ident;
         }
       }
 
@@ -462,9 +462,9 @@ public function marshalProvisioningData(int $id): array {
 
       $identifiers = [];
 
-      foreach($ret['data']->identifiers as $id) {
-        if($id->status == SuspendableStatusEnum::Active) {
-          $identifiers[] = $id;
+      foreach($ret['data']->identifiers as $ident) {
+        if($ident->status == SuspendableStatusEnum::Active) {
+          $identifiers[] = $ident;
         }
       }
 
diff --git a/app/templates/element/filter.php b/app/templates/element/filter.php
index 5ee4f8b92..359c7f749 100644
--- a/app/templates/element/filter.php
+++ b/app/templates/element/filter.php
@@ -121,7 +121,7 @@
           <button class="top-filters-active-filter deletebutton spin btn btn-default btn-sm" data-identifier="<?= $data_identifier ?>" type="button" aria-controls="<?php print $aria_controls; ?>" title="<?= __d('operation', 'clear.filters',[2]); ?>">
             <em class="material-icons" aria-hidden="true">cancel</em>
             <span class="top-filters-active-filter-title">
-              <?= !empty($columns[$key]['label']) ? $columns[$key]['label'] : $vv_searchable_attributes[$key]['label'] ?>
+              <?= Inflector::humanize(Inflector::underscore($vv_searchable_attributes[$key]['label'] ?? $columns[$key]['label'])) ?>
             </span>
             <?php if($vv_searchable_attributes[$key]['type'] != 'boolean'): ?>
               <span class="top-filters-active-filter-value">
@@ -148,16 +148,15 @@
         $inactiveFiltersCount = 0; // for re-balancing the columns and submit buttons
         
         if(!empty($columns)) {
-          // To make our filters consistently ordered with the index columns, sort the $vv_searchable_attributes
-          // by the keys of columns.inc $indexColumns (passed in to this View element as $indexColumns and referenced
-          // as "$columns"). The fields found in $columns will be placed first in the resulting array.
-          // The result should only include fields that exist in the original $vv_searchable_attributes array.
-          
-          // XXX Turn this off. We should have more arbitrary control over the order of the filters, and for the moment
-          //     it is better (at least for now) to let the explicitly defined filters come first.
-          // $vv_searchable_attributes = array_intersect_key(array_replace(array_flip(array_keys($columns)), $vv_searchable_attributes), $vv_searchable_attributes);
+          // The searchable attributes will be sorted first alphabetically
+          asort($vv_searchable_attributes);
+          // Sort the order attribute
+          uasort($vv_searchable_attributes, function ($item1, $item2) {
+            if ($item1['order'] == $item2['order']) return 0;
+            return $item1['order'] < $item2['order'] ? -1 : 1;
+          });
         }
-        
+
         foreach($vv_searchable_attributes as $key => $options) {
           if($options['type'] == 'boolean') {
             $field_booleans_columns[$key] = $options;
@@ -166,7 +165,13 @@
             $field_datetime_columns[$key] = $options;
             continue;
           }
-          
+
+          $label = Inflector::humanize(
+            Inflector::underscore(
+              $options['label'] ?? $columns[$key]['label']
+            )
+          );
+
           if($options['type'] == 'date') {
             // Date fields use a date picker (e.g. DOB)
             // (Note that timestamps are handled specially. See below.)
@@ -202,7 +207,7 @@
             
             // Create a text field to hold our date value.
             print '<div class="top-filters-fields-date ' . $wrapperCssClass . '">';
-            print $this->Form->label($key, !empty($columns[$key]['label']) ? $columns[$key]['label'] : $options['label']);
+            print $this->Form->label($key, $label);
             print '<div class="d-flex">';
             print $this->Form->text($key, $opts) . $this->element('datePicker', $date_args);
             print '</div>';
@@ -210,7 +215,7 @@
           } else {
             // text input
             $formParams = [
-              'label' => !empty($columns[$key]['label']) ? $columns[$key]['label'] : $options['label'],
+              'label' => $label,
               // The default type is text, but we might convert to select below
               'type' => 'text',
               'value' => (!empty($query[$key]) ? $query[$key] : ''),