Fixed service instance recovery from agent to include serviceId