EZP-22564: temp skip: MapLocation custom field
EZP-22564: temp fix: special case for Field Criterion and Country field