escapeHtml added for diff