Improve secondary indexes. Less states are available