Added support for HTML entity passthrough