Added more html entities