little change on escapeHtml