Fix bug for offers without location
Revert perliminary changes