escaping html entities
fixed escaping
added optional escaping