Force Bar 1 before swap

[Spartacus1066]

When I swap from a 2 bar setup to 1 bar, but am on Bar 2 when I activate the hotkey to swap... then I end up on Bar 2 of the chosen setup. It is only a problem when it is a 1 Bar Oakensoul build and someone has started an encounter before I can correct the outfit change.
A checkbox to "Force First Bar before Swapping" would be wonderful!
...or maybe there is a better solution. (Mark a build as 1-Bar, and when it gets loaded, auto-swap to bar 1.)
Thanks for a GREAT tool!