RPSW-208: improved specialchar handling