Url ordering fix