Fix org list for menu