[WIP] Fix loop on Collection::map()

Resolves easybib/issues#1082