Updated latest search changes to master