Fix org switch to display organizations