3.1 Html fixes #2316 #2323