EscapeUriString changed to EscapeDataString

EscapeUriString changed to EscapeDataString so ampersands can be used as arguments

Using EscapeUriString does not escape query parameters containing ampersands correctly.