I addressed this in the org switcher PR https://github.com/Katello/katello/pull/3223 and will hold this PR for that one.