Updated: Search method

Updated: Search method