#572

Fixing problem with org list showing as group list
Merge pull request #574 from OCHA-DAP/fixes-for-2_2-upgrade

#572