Added HTML Encoding on output