Better import filename handling and smaller toGeoJSON