Thanks @bluewavenet
Used your fix for the first time today and its working wonders.
Would be great if the switch function works in a future update but this will suffice for now.
Cheers