working on #241: poi-improvements
Merge branch 'feature/241-poi-improvements' into dev