Fix endpoints ids to be unique, see #7