working on fixing search functionality