#1383 and fixing topics
Merge pull request #1412 from OCHA-DAP/dan-sprint-34

#1383 and fixing topics