More changes for secondary indexes