Sort teams on name of the folder before sorting on name of the team

[Quint_]

Right now on client, teams are shown alpabetically in the teambuilder and team select.
Would it be possible to sort the teams on foldername, if you have any, first, before sorting them on name?
Right now the teambuilder itself shows folders alphabetically but the team select doesn't.

Current team select

I added some teams to show what I exactly mean

Suggested team select