diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
index aa1a2b0c22abf46dc7a1dbd261fe78f364c1dcc9..3861263518d89a08038dd9078df28f97f6bf8695 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
@@ -871,9 +871,9 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
                 {
                     pagingToolbar.disableExportButton();
                     pagingToolbar.updateDefaultConfigButton(false);
+                    filterToolbar.refresh();
                     // export and config buttons are enabled when ListEntitiesCallback is complete
                     refresh();
-                    filterToolbar.refresh();
                 }
             };
     }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java
index 3a494b7263c6e223b262bd22f135adc178aee65d..8cb8bac5ca03d8466edf94efbfb3ea8ef03e124c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java
@@ -52,7 +52,7 @@ public class ListColumnFilterWidget<T> extends ComboBox<ModelData> implements
 
     private final static String MODEL_VALUE_KEY = "value";
 
-    private static final String EMPTY_VALUE = "-- empty --";
+    private static final String EMPTY_VALUE = "(empty)";
 
     private final IColumnDefinition<T> filteredField;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
index 3b113c13044ac6441273be8672a414b093528a5c..13b9c8bd1da66f8dce13d12ba281e8a0cefb327c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
@@ -331,6 +331,7 @@ public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationOb
     public void refresh()
     {
         filterSelectionWidget.refreshStore();
+        resetFilterFields();
     }
 
     // ------------------------------------