Issue #496: HPO reindexing should be done as a single step