Fix to the search controller