Fixed potential URL encoding issue