Modified HTML to properly escape strings.
Merged.