YH-130: Pre-select organization and UI updates