US632 - fix contextual issues in XML labels