Small improvement to search