Search now plays nice