WIP: BibIndex: improvements for master

It's from IANA, and Thorsten and Annette fixed some names