html entities fixes

#87 #88