Continue fixing up queries.

Change the remaining instances of spec to spetator and remove id from
/servers REST API endpoints.