Making the conversation is query work again
Getting the endpoints list back in order