marc21 adapter: bug fixes