Functionality Request for searching game (different civ for each game type)

Search mechanism of the game allows us to search multiple types of games, such as 1v1, 2v2,3v3 and supremacy or empire wars. As well as this a good thing, it has one missing point. What if the civ i prefer is different for each game type ? For example, I may want to play otto in 1v1, but french for 3v3.

So, it would be very nice to be able to select a different civ for each search type.