Added some of the search functionality