Add indexes to types_i used by test-select