Getting the endpoints list back in order