Fix improperly escaped HTML entities
Fixes #2351