Feature/fix-freeagent-list