Better HTML escaping (Fix #1)