Issue #2594307 by Berdir, Ginovski: Fixed manual replacement of encoded HTML character leads to double de-escaping and missing output