bug fixes to conflation and new code to load OSM as initial POI data