3.1 html fixes part2 #2323