As said on other pull requests, would help to allow uri encoding of params