Fixed more character escapings