Better url generation method



/foo?{&bar} will became /foo?&bar=value

using this patch, /foo{?bar} will became /foo?bar=value