Updates to the search and sort