SearchController refactored - TODO removed