BZ-9480: Offers Improvements