Fixed url generation

This fix:
* fixes extra parameters in url generation
* fixes named parameters support (so ordering of params doesnt matter now)