Switch to use HTML entities