Extracted element name encoding into function. Moved indicators back as attributes to element
Extracted element name encoding into function. Moved indicators back as attributes to element

dcrossleyau/yaz,nla/yaz,nla/yaz,dcrossleyau/yaz,nla/yaz,nla/yaz,dcrossleyau/yaz