Cleaned up SearchController