Some changes to Guest Search