It would be great if people can add some additional filters before entering the queue. E.g. if everyone can indicate if they are willing to play on water or hybrid maps, it would be eventually much less frustrating experience.
Matchmaking can consider this simple binary information, and preventing longer waiting times for people who would actually enjoy a round of water battle with random other people close to their rank.
Right now the experience with some maps is, that in 90% of team games, somebody quits in matchmaking or even worse, after couple of minutes…