Update on the search function