Shapefile export: fix/enhance