Reset queue settings on game restart?

I've had it happen two times in the last week that I played team games with friends in the evening and then the next day wanted to play some 1v1, but accidently queued for team games with randomly matched players. When you join a new queue (alone) it keeps your old settings (for example, queueing for 2v2 the day before) and just adds 1v1. I don't find this very intuitive. Either it should disselect everything besides 1v1 or, maybe the better solution, it should just have nothing selected so that you have to make a choice before queuing and don't accidently queue for the wrong game.

Obviously this should only be reset on game restart because often you play multiple team games or 1v1s in a row, so resetting it every time after a game does not make sense. However I think, when you play the next day or even days after again you don't necessarily remember or check the settings and just queue - leading to people ending up in team games (or 1v1) they didn't want to play or people dodging to requeue.