fixing client side endpoint management