diff --git a/app/src/Model/Table/ApiUsersTable.php b/app/src/Model/Table/ApiUsersTable.php
index 2b2eca51f..c235f472c 100644
--- a/app/src/Model/Table/ApiUsersTable.php
+++ b/app/src/Model/Table/ApiUsersTable.php
@@ -47,7 +47,8 @@ class ApiUsersTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
-  
+  use \App\Lib\Traits\SearchFilterTrait;
+
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/src/Model/Table/PeopleTable.php b/app/src/Model/Table/PeopleTable.php
index a770506f3..5a4aee63b 100644
--- a/app/src/Model/Table/PeopleTable.php
+++ b/app/src/Model/Table/PeopleTable.php
@@ -45,7 +45,7 @@ class PeopleTable extends Table {
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  
+
   /**
    * Perform Cake Model initialization.
    *
diff --git a/app/templates/Types/columns.inc b/app/templates/Types/columns.inc
index 0a3b29676..24b9ee2f1 100644
--- a/app/templates/Types/columns.inc
+++ b/app/templates/Types/columns.inc
@@ -47,6 +47,7 @@ $indexColumns = [
 $topLinks = [
   [
     'icon'  => 'settings_backup_restore',
+    'order' => 'Default',
     'label' => __d('operation', 'Types.restore'),
     'link'  => [
       'action' => 'restore'
diff --git a/app/templates/layout/default.php b/app/templates/layout/default.php
index 3552c8c0b..a0b9cfafd 100644
--- a/app/templates/layout/default.php
+++ b/app/templates/layout/default.php
@@ -58,6 +58,7 @@
     <?= $this->Html->css([
       'fonts/Font-Awesome-4.6.3/css/font-awesome.min',
       'bootstrap/bootstrap.min',
+      'select2/select2.min',
       'co-color',
       'co-base',
       'co-responsive'
@@ -66,7 +67,8 @@
     <!-- Load Bootstrap and jQuery (other scripts at bottom) -->
     <?= $this->Html->script([
       'bootstrap/bootstrap.bundle.min.js',
-      'jquery/jquery.min.js'
+      'jquery/jquery.min.js',
+      'select2/select2.min.js'
     ]) . "\n"; ?>
 
     <!-- Include external files and scripts -->