diff --git a/app/templates/ApiUsers/columns.inc b/app/templates/ApiUsers/columns.inc
index 87c426e6b..29d9aef96 100644
--- a/app/templates/ApiUsers/columns.inc
+++ b/app/templates/ApiUsers/columns.inc
@@ -32,9 +32,6 @@ if($vv_cur_co->id == 1) {
   ];
 }
 
-// Turn off the search/filter box for this index view
-//$disableFiltering = true;
-
 $indexColumns = [
   'username' => [
     'type' => 'link',
diff --git a/app/templates/Cous/columns.inc b/app/templates/Cous/columns.inc
index d50fd5ed2..72f9f5fd3 100644
--- a/app/templates/Cous/columns.inc
+++ b/app/templates/Cous/columns.inc
@@ -25,9 +25,6 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-// Turn off the search/filter box for this index view
-//$disableFiltering = true;
-
 $indexColumns = [
   'name' => [
     'type' => 'link'
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index 170bbfcab..6d5136e8f 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -46,9 +46,6 @@
 // Otherwise, we'll print out a "no records" message.
 $recordsExist = false;
 
-// By default Index filtering is on and we need to explicitly disable it
-$disableFiltering = false;
-
 // Our default link actions, in order of preference, unless the column config overrides it
 $linkActions = ['edit', 'view'];
 
@@ -161,7 +158,7 @@ function _column_key($modelsName, $c, $tz=null) {
 <?php endif; // $banners ?>
 
 <!-- Search block -->
-<?php if(!$disableFiltering): ?>
+<?php if(isset($vv_searchable_attributes)): ?>
   <?= $this->element('filter'); ?>
 <?php endif; ?>
 
diff --git a/app/templates/Types/columns.inc b/app/templates/Types/columns.inc
index 24b9ee2f1..8eeeff44a 100644
--- a/app/templates/Types/columns.inc
+++ b/app/templates/Types/columns.inc
@@ -25,9 +25,6 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-// Turn off the search/filter box for this index view
-//$disableFiltering = true;
-
 $indexColumns = [
   'display_name' => [
     'type' => 'link',