HTML encoding fixed