refactor mappable scope and add tests for it
fix bug delaying geocoding till the user or offer is updated