CB-7291 Fix unintended html tags that hosed rendering.