Harmonized POIs/outlets

Bock, Andy requested to merge Bock into master Sep 01, 2021