A few last fixes for HTML-escaped strings

A few more fixes.