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 1eee84c70121fe1f24c5172435c850e504cedef5..4c38d643270df9486594eef37a53c760f3c347ff 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
@@ -891,7 +891,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
                     pagingToolbar.updateDefaultConfigButton(false);
                     // export and config buttons are enabled when ListEntitiesCallback is complete
                     refresh();
-                    filterToolbar.execute();
+                    filterToolbar.refresh();
                 }
             };
     }
@@ -1203,7 +1203,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
                     // settings will be automatically stored because of event handling
                     refreshColumnsSettings();
                     refreshColumnHeaderWidths();
-                    filterToolbar.execute();
+                    filterToolbar.refresh();
                 }
             };
         List<ColumnDataModel> settingsModel =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java
index c4da2ab76de650f07448740da9a96ab5403b23c9..1aaa4c9dc98ac6fc08f8e8690f3a16b72cde1d94 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java
@@ -26,7 +26,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewConte
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisplayTypeIDProvider;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.DropDownList;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomFilter;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
@@ -36,8 +35,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKin
  * 
  * @author Izabela Adamczyk
  */
-public final class FilterSelectionWidget extends DropDownList<FilterModel, GridCustomFilter> implements
-        IDelegatedAction
+public final class FilterSelectionWidget extends DropDownList<FilterModel, GridCustomFilter> 
 {
     private static final String LIST_ITEMS_CALLBACK = "ListItemsCallback";
 
@@ -83,9 +81,4 @@ public final class FilterSelectionWidget extends DropDownList<FilterModel, GridC
     {
         return DatabaseModificationKind.any(ObjectKind.GRID_CUSTOM_FILTER);
     }
-
-    public void execute()
-    {
-        refreshStore();
-    }
 }
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 06e116caba1a37b5e60c877695e5d17c8d4087a1..b9d35df553b4cfdbb4f5f4ed2bdb89aea2af8ff8 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
@@ -40,8 +40,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomFilter;
  * 
  * @author Izabela Adamczyk
  */
-public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationObserver,
-        IDelegatedAction
+public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationObserver
 {
     static final String APPLY_ID = "apply_button";
 
@@ -285,9 +284,9 @@ public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationOb
         }
     }
 
-    public void execute()
+    public void refresh()
     {
-        filterSelectionWidget.execute();
+        filterSelectionWidget.refreshStore();
     }
 
 }