Updated search code. #38