changed property access to tags
Merge branch 'feature/xml-template-improvements' into develop