added extra conversions for html entities