improve url creation