Implemented better search