BZ-9592: Changes to avoid getting offers unless the location get changed