Server - improve endpoint list handling