Improve separation of selection/search/options