Add  version of search functionality