Some additional changes for GuestSearch