working on fixing searching