It’s a little more involved, because the current code is doing all kinds of clever rearrangment of the elements.
The simplest approach is probably to override this Computed Property boolean switch with my own calc and everything should be dandy! 
Update: all sorted, sorry to bother you!