CDX: Reference fields by name only to avoid index errors