Fix regressions
Start customizing POI JSON