BZ-12528: HTML cleanup