#1721 bug fixes
Merge pull request #1871 from OCHA-DAP/permalink

Pull request #1721 bug fixes