Improvements to osm_import and addr_import functions