Fixed issue with & in URLs