Fix for non-latin characters in URLs