Use the server ID instead of name, for safer matching