WIP: Bibindex: improvements for master

We need to separate kbload into a separate commit