Case #3964 - Improved organizations view