Updates to search functionality