Bug 10566: (follow-up) fix HTML validation issues