Bug 5103: (follow-up) Using mapped item fields instead of hardcoding subfields