Fix ordering in urls