FilterByMenuBuilder refactoring started