DEVELOPER-827 html tag fixes