Better org selection behavior.

Don't like the code structure though...