Further improvements to field name mappings for shp export.