More work on hierarchical indexing