Moved HTML escaping to renderer