Fixed HTML escaping; need rerun supervision prepare