Support sub-entries in keyword index. Finishes [5daecde7]