YH-437: Switch organization type selection from dropdown to tree modal