[[ Bug 12478 ]] Fix iOS URL issues
Merge pull request #891 from runrevali/bugfix-12478

[[ Bug 12478 ]] Fix iOS URL issues