F: Added simple organization selection.