Flesh out secondary indexes some more