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