diff --git a/list.php b/list.php
index 48bea500..40e8f38e 100644
--- a/list.php
+++ b/list.php
@@ -53,9 +53,32 @@ if ($is_admin) {
     }
 }
 
-$handler->getList('');
+$search     = safeget('search', safesession("search_$table", array()));
+$searchmode = safeget('searchmode', safesession("searchmode_$table", array()));
+
+if (!is_array($search) || !is_array($searchmode)) {
+    # avoid injection of raw SQL if $search is a string instead of an array
+    die("Invalid parameter");
+}
+
+if (safeget('reset_search', 0)) {
+    $search = array();
+    $searchmode = array();
+}
+$_SESSION["search_$table"] = $search;
+$_SESSION["searchmode_$table"] = $searchmode;
+
+if (count($search)) {
+    $handler->getList($search, $searchmode);
+} else {
+    $handler->getList('');
+}
 $items = $handler->result();
 
+if (count($handler->errormsg)) flash_error($handler->errormsg);
+if (count($handler->infomsg))  flash_error($handler->infomsg);
+
+
 if (safeget('output') == 'csv') {
 
     $out = fopen('php://output', 'w');
@@ -103,6 +126,8 @@ if (safeget('output') == 'csv') {
     $smarty->assign('items', $items);
     $smarty->assign('id_field', $handler->getId_field());
     $smarty->assign('formconf', $formconf);
+    $smarty->assign('search', $search);
+    $smarty->assign('searchmode', $searchmode);
 
     $smarty->display ('index.tpl');
 
diff --git a/templates/list.tpl b/templates/list.tpl
index 68af8a65..2620d4e3 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -8,6 +8,19 @@
 {#form_search#}
 </div>
 
+    {if ($search|count > 0)}
+        <div class='searchparams'>
+            <p>{$PALANG.searchparams}
+            {foreach key=key item=field from=$search}
+                <span>{if $struct.$key.label}{$struct.$key.label}{else}{$key}{/if}
+                    {if isset($searchmode.$key)}{$searchmode.$key}{else}={/if} {$field}
+                </span>
+            {/foreach}
+            <span><a href="list.php?table={$table}&reset_search=1">[x]</a></span>
+        </div>
+    {/if}
+
+
 
 <div id="list">
 <table border=0 id='admin_table'><!-- TODO: 'admin_table' needed because of CSS for table header -->