Added new search functionality