add tag to render addresses with type
fix tag for address rendering
Merge branch 'master' into propertygroups
fixes, updated tests