fixing #10561 & HTML structure