Fixed display problem when XML attributes contain ampersands

Change-Id: I6e0a2ecfef7492b18eb26250e6a01b03a4528258