Fixed the rest of the searches.