Some guest-search changes