BZ-8765: Changes to ensure offers being show