improvements to osm_import script and addr_import and templates