- Fixed issue with special chars
- Fix for iOS