small fixes related topics and features
Merge pull request #1359 from OCHA-DAP/sprint-33-bugs-alex

small fixes related topics and features