Refactoring: Change functions order in FilterToolBar