Change discriminators for OfferCode
Add annotations for SearchRedirect