fix tag for address rendering
Merge remote-tracking branch 'upstream/master'