fix html entities
remove 5.18 warnings