#6 Fixed various problems with HTML in names.