closes #1172
Merge pull request #1173 from OCHA-DAP/dev-refactoring-bugs

closes #1172