Getting interstitial org switcher functional and related refactorings, fixes #2189.

This fixes the interstitial org switcher.