Modify Search Method