Renamed searches to remove redundant test