Add changes to search code