fixes #968 -
Merge pull request #979 from OCHA-DAP/arty-bug-fixing

fixes #968 -
Merge pull request #980 from OCHA-DAP/dev

Dev into Staging