use correct field names like defined in mapping