Now with fewer illegal HTML entities