Fix url creation