Added replacements for special chars