Merge pull request #99 from lensky84/12744

12744 Update address on map
fix content
Merge remote-tracking branch 'remotes/upstream/master' into 12744