Got retrieving team users running much faster, still a bit more to do
Querying team users should be faster now