More work on secondary index improvements