Edit server fixes

Before this update, the servers would be listed multiple times once a
server update occurred, this fixes that.