fix the field names in the mapping for geo.* fields