Weapon Swap Crossbow

When weapon swapping from Weapon Set I (Using High Velocity and Armour Break but my guess its all Ammo types) to Weapon Set II Using Flash (Guessing all Grenade Skills too) if it don't reload before swapping from bolts to Grenades it will lock me to Grenades unless I manual reload by pressing the Bolt skill instead of Weapon Set I's crossbow shot
I have made sure I'm using WS I's crossbow show.
I have tried "Locking" a Crossbow to I and II no luck a tried getting a new Crossbow for WS II no luck, the only way to get it to swap back is to use any reload to swap it back

I am having the same issue, but with two different skills. I have two crossbow setups, one for permafrost bolts, and the other is set for galvanic shards and shockburst rounds. When I try to switch to weapon set 2, which is galvanic bolts and shockburst rounds, it highlights the skill but does not load the ammo.