Fix draw display by team, start work on fixing draw sorting (work in progress)
Add fix draw display by team link