Hotfix: Fix html encoding problems