Fix to url generation