Updated search_controller