organization selector changes.. still buggy