small menu items refactor, set before filters