diff --git a/application/controllers/DataController.php b/application/controllers/DataController.php
index ad2f0bcf..237b900c 100644
--- a/application/controllers/DataController.php
+++ b/application/controllers/DataController.php
@@ -19,6 +19,7 @@ class DataController extends ActionController
         $this->setDataTabs()->activate('datalist');
         $this->view->title = $this->translate('Data lists');
         $this->prepareAndRenderTable('datalist');
+        $this->provideFilterEditorForTable($this->view->table);
     }
 
     public function listAction()
@@ -125,6 +126,7 @@ class DataController extends ActionController
         $this->setDataTabs()->activate('datafield');
         $this->view->title = $this->translate('Data fields');
         $this->prepareAndRenderTable('datafield');
+        $this->provideFilterEditorForTable($this->view->table);
     }
 
     public function listentryAction()
diff --git a/application/tables/DatafieldTable.php b/application/tables/DatafieldTable.php
index 4964b293..36124f0a 100644
--- a/application/tables/DatafieldTable.php
+++ b/application/tables/DatafieldTable.php
@@ -10,6 +10,7 @@ class DatafieldTable extends QuickTable
 {
     protected $searchColumns = array(
         'varname',
+        'caption',
     );
 
     public function getColumns()