Re-add html escaping function
fix capitalization for consistency