Fix url generation