SearchController cleanup