Added some search functionality