Merge in search changes to develop.