[stable30] fix: use entities instead of char convertoing

[stable30] fix: use entities instead of char convertoing #2652