Magazine swap placement improvement

Hi! I really like the game. Having a blast. But there's on thing that has really been infuriating me. It's probably been brought up before but I need to know.

Is there anyway to make it so swapping mags doesn't result in placing 1 slot magazines in 2 slot pouches?

Here's the situation: I have 4 two-slot pouches, and 4 one-slot pouches. That's where I put my 30 round mags. I leave one of those two-slot pouches empty so that I can put my empty mags in there when I swap so that I don't drop them on the floor. I keep my pistol mags (one-slot mags) in 2 of the one-slot puches.

Except when I reload with my pistol my idiot operator puts the one-slot pistol mag into the only empty two-slot pouch I have, rather than putting it in the one-slot pouch that I have empty. This means that I now don't have an empty two-slot pouch for my 30 round rifle mag, and if I reload my rifle, I now drop the magazine on the floor.

This is just the most annoying thing ever. One-slot mags should prioritize one-slot pouches if they're available. Thank you for coming to my Ted Talk.