closes 587
Merge pull request #626 from OCHA-DAP/org-issues

closes 587