Support for the url params

Small change, but pretty critical IMO.