Fixed issues with url encoding.