Bug 4366: Improve COinS support for MARC21