WIP: BibIndex: improvements for master