Cherry picked roberts search changes