Fix improperly escaped HTML entities

Ref #2349