Attempt to fix queries on the team page