Fixing team retrieval