WIP: Bibindex: improvements for master