Fix issue with URL encoding