adding special chars handling