Unify on empty array indexes

7 files changed, 627 insertions, 627 deletions

diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg
index 2ec686217ad..1a31fe94b05 100644
--- a/config-model/src/test/derived/newrank/attributes.cfg
+++ b/config-model/src/test/derived/newrank/attributes.cfg
@@ -1,200 +1,200 @@
-attribute[0].name "sales"
-attribute[0].datatype INT32
-attribute[0].collectiontype SINGLE
-attribute[0].removeifzero false
-attribute[0].createifnonexistent false
-attribute[0].fastsearch false
-attribute[0].huge false
-attribute[0].sortascending true
-attribute[0].sortfunction UCA
-attribute[0].sortstrength PRIMARY
-attribute[0].sortlocale ""
-attribute[0].enablebitvectors false
-attribute[0].enableonlybitvector false
-attribute[0].fastaccess false
-attribute[0].arity 8
-attribute[0].lowerbound -9223372036854775808
-attribute[0].upperbound 9223372036854775807
-attribute[0].densepostinglistthreshold 0.4
-attribute[0].tensortype ""
-attribute[0].imported false
-attribute[1].name "pto"
-attribute[1].datatype INT32
-attribute[1].collectiontype SINGLE
-attribute[1].removeifzero false
-attribute[1].createifnonexistent false
-attribute[1].fastsearch false
-attribute[1].huge false
-attribute[1].sortascending true
-attribute[1].sortfunction UCA
-attribute[1].sortstrength PRIMARY
-attribute[1].sortlocale ""
-attribute[1].enablebitvectors false
-attribute[1].enableonlybitvector false
-attribute[1].fastaccess false
-attribute[1].arity 8
-attribute[1].lowerbound -9223372036854775808
-attribute[1].upperbound 9223372036854775807
-attribute[1].densepostinglistthreshold 0.4
-attribute[1].tensortype ""
-attribute[1].imported false
-attribute[2].name "mid"
-attribute[2].datatype INT32
-attribute[2].collectiontype SINGLE
-attribute[2].removeifzero false
-attribute[2].createifnonexistent false
-attribute[2].fastsearch false
-attribute[2].huge false
-attribute[2].sortascending true
-attribute[2].sortfunction UCA
-attribute[2].sortstrength PRIMARY
-attribute[2].sortlocale ""
-attribute[2].enablebitvectors false
-attribute[2].enableonlybitvector false
-attribute[2].fastaccess false
-attribute[2].arity 8
-attribute[2].lowerbound -9223372036854775808
-attribute[2].upperbound 9223372036854775807
-attribute[2].densepostinglistthreshold 0.4
-attribute[2].tensortype ""
-attribute[2].imported false
-attribute[3].name "weight"
-attribute[3].datatype FLOAT
-attribute[3].collectiontype SINGLE
-attribute[3].removeifzero false
-attribute[3].createifnonexistent false
-attribute[3].fastsearch false
-attribute[3].huge false
-attribute[3].sortascending true
-attribute[3].sortfunction UCA
-attribute[3].sortstrength PRIMARY
-attribute[3].sortlocale ""
-attribute[3].enablebitvectors false
-attribute[3].enableonlybitvector false
-attribute[3].fastaccess false
-attribute[3].arity 8
-attribute[3].lowerbound -9223372036854775808
-attribute[3].upperbound 9223372036854775807
-attribute[3].densepostinglistthreshold 0.4
-attribute[3].tensortype ""
-attribute[3].imported false
-attribute[4].name "bgnpfrom"
-attribute[4].datatype FLOAT
-attribute[4].collectiontype SINGLE
-attribute[4].removeifzero false
-attribute[4].createifnonexistent false
-attribute[4].fastsearch false
-attribute[4].huge false
-attribute[4].sortascending true
-attribute[4].sortfunction UCA
-attribute[4].sortstrength PRIMARY
-attribute[4].sortlocale ""
-attribute[4].enablebitvectors false
-attribute[4].enableonlybitvector false
-attribute[4].fastaccess false
-attribute[4].arity 8
-attribute[4].lowerbound -9223372036854775808
-attribute[4].upperbound 9223372036854775807
-attribute[4].densepostinglistthreshold 0.4
-attribute[4].tensortype ""
-attribute[4].imported false
-attribute[5].name "newestedition"
-attribute[5].datatype INT32
-attribute[5].collectiontype SINGLE
-attribute[5].removeifzero false
-attribute[5].createifnonexistent false
-attribute[5].fastsearch false
-attribute[5].huge false
-attribute[5].sortascending true
-attribute[5].sortfunction UCA
-attribute[5].sortstrength PRIMARY
-attribute[5].sortlocale ""
-attribute[5].enablebitvectors false
-attribute[5].enableonlybitvector false
-attribute[5].fastaccess false
-attribute[5].arity 8
-attribute[5].lowerbound -9223372036854775808
-attribute[5].upperbound 9223372036854775807
-attribute[5].densepostinglistthreshold 0.4
-attribute[5].tensortype ""
-attribute[5].imported false
-attribute[6].name "year"
-attribute[6].datatype INT32
-attribute[6].collectiontype SINGLE
-attribute[6].removeifzero false
-attribute[6].createifnonexistent false
-attribute[6].fastsearch false
-attribute[6].huge false
-attribute[6].sortascending true
-attribute[6].sortfunction UCA
-attribute[6].sortstrength PRIMARY
-attribute[6].sortlocale ""
-attribute[6].enablebitvectors false
-attribute[6].enableonlybitvector false
-attribute[6].fastaccess false
-attribute[6].arity 8
-attribute[6].lowerbound -9223372036854775808
-attribute[6].upperbound 9223372036854775807
-attribute[6].densepostinglistthreshold 0.4
-attribute[6].tensortype ""
-attribute[6].imported false
-attribute[7].name "did"
-attribute[7].datatype INT32
-attribute[7].collectiontype SINGLE
-attribute[7].removeifzero false
-attribute[7].createifnonexistent false
-attribute[7].fastsearch false
-attribute[7].huge false
-attribute[7].sortascending true
-attribute[7].sortfunction UCA
-attribute[7].sortstrength PRIMARY
-attribute[7].sortlocale ""
-attribute[7].enablebitvectors false
-attribute[7].enableonlybitvector false
-attribute[7].fastaccess false
-attribute[7].arity 8
-attribute[7].lowerbound -9223372036854775808
-attribute[7].upperbound 9223372036854775807
-attribute[7].densepostinglistthreshold 0.4
-attribute[7].tensortype ""
-attribute[7].imported false
-attribute[8].name "scorekey"
-attribute[8].datatype INT32
-attribute[8].collectiontype SINGLE
-attribute[8].removeifzero false
-attribute[8].createifnonexistent false
-attribute[8].fastsearch false
-attribute[8].huge false
-attribute[8].sortascending true
-attribute[8].sortfunction UCA
-attribute[8].sortstrength PRIMARY
-attribute[8].sortlocale ""
-attribute[8].enablebitvectors false
-attribute[8].enableonlybitvector false
-attribute[8].fastaccess false
-attribute[8].arity 8
-attribute[8].lowerbound -9223372036854775808
-attribute[8].upperbound 9223372036854775807
-attribute[8].densepostinglistthreshold 0.4
-attribute[8].tensortype ""
-attribute[8].imported false
-attribute[9].name "cbid"
-attribute[9].datatype INT32
-attribute[9].collectiontype SINGLE
-attribute[9].removeifzero false
-attribute[9].createifnonexistent false
-attribute[9].fastsearch false
-attribute[9].huge false
-attribute[9].sortascending true
-attribute[9].sortfunction UCA
-attribute[9].sortstrength PRIMARY
-attribute[9].sortlocale ""
-attribute[9].enablebitvectors false
-attribute[9].enableonlybitvector false
-attribute[9].fastaccess false
-attribute[9].arity 8
-attribute[9].lowerbound -9223372036854775808
-attribute[9].upperbound 9223372036854775807
-attribute[9].densepostinglistthreshold 0.4
-attribute[9].tensortype ""
-attribute[9].imported false
\ No newline at end of file
+attribute[].name "sales"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "pto"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "mid"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "weight"
+attribute[].datatype FLOAT
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "bgnpfrom"
+attribute[].datatype FLOAT
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "newestedition"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "year"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "did"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "scorekey"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
+attribute[].name "cbid"
+attribute[].datatype INT32
+attribute[].collectiontype SINGLE
+attribute[].removeifzero false
+attribute[].createifnonexistent false
+attribute[].fastsearch false
+attribute[].huge false
+attribute[].sortascending true
+attribute[].sortfunction UCA
+attribute[].sortstrength PRIMARY
+attribute[].sortlocale ""
+attribute[].enablebitvectors false
+attribute[].enableonlybitvector false
+attribute[].fastaccess false
+attribute[].arity 8
+attribute[].lowerbound -9223372036854775808
+attribute[].upperbound 9223372036854775807
+attribute[].densepostinglistthreshold 0.4
+attribute[].tensortype ""
+attribute[].imported false
diff --git a/config-model/src/test/derived/newrank/ilscripts.cfg b/config-model/src/test/derived/newrank/ilscripts.cfg
index d8f9b5101ad..11fc1b310a1 100644
--- a/config-model/src/test/derived/newrank/ilscripts.cfg
+++ b/config-model/src/test/derived/newrank/ilscripts.cfg
@@ -1,67 +1,67 @@
 maxtermoccurrences 100
 fieldmatchmaxlength 1000000
-ilscript[0].doctype "newrank"
-ilscript[0].docfield[0] "bgndata"
-ilscript[0].docfield[1] "sales"
-ilscript[0].docfield[2] "pto"
-ilscript[0].docfield[3] "keys"
-ilscript[0].docfield[4] "mid"
-ilscript[0].docfield[5] "ew"
-ilscript[0].docfield[6] "surl"
-ilscript[0].docfield[7] "userrate"
-ilscript[0].docfield[8] "pid"
-ilscript[0].docfield[9] "weight"
-ilscript[0].docfield[10] "url"
-ilscript[0].docfield[11] "isbn"
-ilscript[0].docfield[12] "fmt"
-ilscript[0].docfield[13] "albumid"
-ilscript[0].docfield[14] "disp_song"
-ilscript[0].docfield[15] "song"
-ilscript[0].docfield[16] "pfrom"
-ilscript[0].docfield[17] "bgnpfrom"
-ilscript[0].docfield[18] "categories"
-ilscript[0].docfield[19] "data"
-ilscript[0].docfield[20] "numreview"
-ilscript[0].docfield[21] "bgnsellers"
-ilscript[0].docfield[22] "image"
-ilscript[0].docfield[23] "artist"
-ilscript[0].docfield[24] "artistspid"
-ilscript[0].docfield[25] "title"
-ilscript[0].docfield[26] "newestedition"
-ilscript[0].docfield[27] "bgnpto"
-ilscript[0].docfield[28] "year"
-ilscript[0].docfield[29] "did"
-ilscript[0].docfield[30] "scorekey"
-ilscript[0].docfield[31] "cbid"
-ilscript[0].content[0] "clear_state | guard { input bgndata | tokenize normalize stem:\"SHORTEST\" | summary bgndata; }"
-ilscript[0].content[1] "clear_state | guard { input sales | summary sales | attribute sales; }"
-ilscript[0].content[2] "clear_state | guard { input pto | summary pto | attribute pto; }"
-ilscript[0].content[3] "clear_state | guard { input keys | tokenize normalize stem:\"SHORTEST\" | index keys; }"
-ilscript[0].content[4] "clear_state | guard { input mid | summary mid | attribute mid; }"
-ilscript[0].content[5] "clear_state | guard { input ew | tokenize normalize stem:\"SHORTEST\" | summary ew | index ew; }"
-ilscript[0].content[6] "clear_state | guard { input surl | summary surl; }"
-ilscript[0].content[7] "clear_state | guard { input userrate | summary userrate; }"
-ilscript[0].content[8] "clear_state | guard { input pid | summary pid; }"
-ilscript[0].content[9] "clear_state | guard { input weight | summary weight | attribute weight; }"
-ilscript[0].content[10] "clear_state | guard { input url | summary url; }"
-ilscript[0].content[11] "clear_state | guard { input isbn | summary isbn; }"
-ilscript[0].content[12] "clear_state | guard { input fmt | tokenize normalize stem:\"SHORTEST\" | summary fmt | index fmt; }"
-ilscript[0].content[13] "clear_state | guard { input albumid | summary albumid; }"
-ilscript[0].content[14] "clear_state | guard { input disp_song | summary disp_song; }"
-ilscript[0].content[15] "clear_state | guard { input song | tokenize normalize stem:\"SHORTEST\" | summary song | index song; }"
-ilscript[0].content[16] "clear_state | guard { input pfrom | summary pfrom; }"
-ilscript[0].content[17] "clear_state | guard { input bgnpfrom | summary bgnpfrom | attribute bgnpfrom; }"
-ilscript[0].content[18] "clear_state | guard { input categories | tokenize normalize stem:\"SHORTEST\" | summary categories | index categories; }"
-ilscript[0].content[19] "clear_state | guard { input data | summary data; }"
-ilscript[0].content[20] "clear_state | guard { input numreview | summary numreview; }"
-ilscript[0].content[21] "clear_state | guard { input bgnsellers | summary bgnsellers; }"
-ilscript[0].content[22] "clear_state | guard { input image | summary image; }"
-ilscript[0].content[23] "clear_state | guard { input artist | tokenize normalize stem:\"SHORTEST\" | summary artist | index artist; }"
-ilscript[0].content[24] "clear_state | guard { input artistspid | summary artistspid; }"
-ilscript[0].content[25] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }"
-ilscript[0].content[26] "clear_state | guard { input newestedition | summary newestedition | attribute newestedition; }"
-ilscript[0].content[27] "clear_state | guard { input bgnpto | tokenize normalize stem:\"SHORTEST\" | summary bgnpto; }"
-ilscript[0].content[28] "clear_state | guard { input year | summary year | attribute year; }"
-ilscript[0].content[29] "clear_state | guard { input did | summary did | attribute did; }"
-ilscript[0].content[30] "clear_state | guard { input scorekey | summary scorekey | attribute scorekey; }"
-ilscript[0].content[31] "clear_state | guard { input cbid | summary cbid | attribute cbid; }"
+ilscript[].doctype "newrank"
+ilscript[].docfield[0] "bgndata"
+ilscript[].docfield[1] "sales"
+ilscript[].docfield[2] "pto"
+ilscript[].docfield[3] "keys"
+ilscript[].docfield[4] "mid"
+ilscript[].docfield[5] "ew"
+ilscript[].docfield[6] "surl"
+ilscript[].docfield[7] "userrate"
+ilscript[].docfield[8] "pid"
+ilscript[].docfield[9] "weight"
+ilscript[].docfield[10] "url"
+ilscript[].docfield[11] "isbn"
+ilscript[].docfield[12] "fmt"
+ilscript[].docfield[13] "albumid"
+ilscript[].docfield[14] "disp_song"
+ilscript[].docfield[15] "song"
+ilscript[].docfield[16] "pfrom"
+ilscript[].docfield[17] "bgnpfrom"
+ilscript[].docfield[18] "categories"
+ilscript[].docfield[19] "data"
+ilscript[].docfield[20] "numreview"
+ilscript[].docfield[21] "bgnsellers"
+ilscript[].docfield[22] "image"
+ilscript[].docfield[23] "artist"
+ilscript[].docfield[24] "artistspid"
+ilscript[].docfield[25] "title"
+ilscript[].docfield[26] "newestedition"
+ilscript[].docfield[27] "bgnpto"
+ilscript[].docfield[28] "year"
+ilscript[].docfield[29] "did"
+ilscript[].docfield[30] "scorekey"
+ilscript[].docfield[31] "cbid"
+ilscript[].content[0] "clear_state | guard { input bgndata | tokenize normalize stem:\"SHORTEST\" | summary bgndata; }"
+ilscript[].content[1] "clear_state | guard { input sales | summary sales | attribute sales; }"
+ilscript[].content[2] "clear_state | guard { input pto | summary pto | attribute pto; }"
+ilscript[].content[3] "clear_state | guard { input keys | tokenize normalize stem:\"SHORTEST\" | index keys; }"
+ilscript[].content[4] "clear_state | guard { input mid | summary mid | attribute mid; }"
+ilscript[].content[5] "clear_state | guard { input ew | tokenize normalize stem:\"SHORTEST\" | summary ew | index ew; }"
+ilscript[].content[6] "clear_state | guard { input surl | summary surl; }"
+ilscript[].content[7] "clear_state | guard { input userrate | summary userrate; }"
+ilscript[].content[8] "clear_state | guard { input pid | summary pid; }"
+ilscript[].content[9] "clear_state | guard { input weight | summary weight | attribute weight; }"
+ilscript[].content[10] "clear_state | guard { input url | summary url; }"
+ilscript[].content[11] "clear_state | guard { input isbn | summary isbn; }"
+ilscript[].content[12] "clear_state | guard { input fmt | tokenize normalize stem:\"SHORTEST\" | summary fmt | index fmt; }"
+ilscript[].content[13] "clear_state | guard { input albumid | summary albumid; }"
+ilscript[].content[14] "clear_state | guard { input disp_song | summary disp_song; }"
+ilscript[].content[15] "clear_state | guard { input song | tokenize normalize stem:\"SHORTEST\" | summary song | index song; }"
+ilscript[].content[16] "clear_state | guard { input pfrom | summary pfrom; }"
+ilscript[].content[17] "clear_state | guard { input bgnpfrom | summary bgnpfrom | attribute bgnpfrom; }"
+ilscript[].content[18] "clear_state | guard { input categories | tokenize normalize stem:\"SHORTEST\" | summary categories | index categories; }"
+ilscript[].content[19] "clear_state | guard { input data | summary data; }"
+ilscript[].content[20] "clear_state | guard { input numreview | summary numreview; }"
+ilscript[].content[21] "clear_state | guard { input bgnsellers | summary bgnsellers; }"
+ilscript[].content[22] "clear_state | guard { input image | summary image; }"
+ilscript[].content[23] "clear_state | guard { input artist | tokenize normalize stem:\"SHORTEST\" | summary artist | index artist; }"
+ilscript[].content[24] "clear_state | guard { input artistspid | summary artistspid; }"
+ilscript[].content[25] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }"
+ilscript[].content[26] "clear_state | guard { input newestedition | summary newestedition | attribute newestedition; }"
+ilscript[].content[27] "clear_state | guard { input bgnpto | tokenize normalize stem:\"SHORTEST\" | summary bgnpto; }"
+ilscript[].content[28] "clear_state | guard { input year | summary year | attribute year; }"
+ilscript[].content[29] "clear_state | guard { input did | summary did | attribute did; }"
+ilscript[].content[30] "clear_state | guard { input scorekey | summary scorekey | attribute scorekey; }"
+ilscript[].content[31] "clear_state | guard { input cbid | summary cbid | attribute cbid; }"
diff --git a/config-model/src/test/derived/newrank/index-info.cfg b/config-model/src/test/derived/newrank/index-info.cfg
index 91a509cc727..3bf7f285f96 100644
--- a/config-model/src/test/derived/newrank/index-info.cfg
+++ b/config-model/src/test/derived/newrank/index-info.cfg
@@ -1,197 +1,197 @@
-indexinfo[0].name "newrank"
-indexinfo[0].command[0].indexname "sddocname"
-indexinfo[0].command[0].command "index"
-indexinfo[0].command[1].indexname "sddocname"
-indexinfo[0].command[1].command "word"
-indexinfo[0].command[2].indexname "bgndata"
-indexinfo[0].command[2].command "index"
-indexinfo[0].command[3].indexname "sales"
-indexinfo[0].command[3].command "index"
-indexinfo[0].command[4].indexname "sales"
-indexinfo[0].command[4].command "attribute"
-indexinfo[0].command[5].indexname "sales"
-indexinfo[0].command[5].command "numerical"
-indexinfo[0].command[6].indexname "pto"
-indexinfo[0].command[6].command "index"
-indexinfo[0].command[7].indexname "pto"
-indexinfo[0].command[7].command "attribute"
-indexinfo[0].command[8].indexname "pto"
-indexinfo[0].command[8].command "numerical"
-indexinfo[0].command[9].indexname "keys"
-indexinfo[0].command[9].command "index"
-indexinfo[0].command[10].indexname "keys"
-indexinfo[0].command[10].command "lowercase"
-indexinfo[0].command[11].indexname "keys"
-indexinfo[0].command[11].command "stem:SHORTEST"
-indexinfo[0].command[12].indexname "keys"
-indexinfo[0].command[12].command "normalize"
-indexinfo[0].command[13].indexname "keys"
-indexinfo[0].command[13].command "plain-tokens"
-indexinfo[0].command[14].indexname "mid"
-indexinfo[0].command[14].command "index"
-indexinfo[0].command[15].indexname "mid"
-indexinfo[0].command[15].command "attribute"
-indexinfo[0].command[16].indexname "mid"
-indexinfo[0].command[16].command "numerical"
-indexinfo[0].command[17].indexname "ew"
-indexinfo[0].command[17].command "index"
-indexinfo[0].command[18].indexname "ew"
-indexinfo[0].command[18].command "lowercase"
-indexinfo[0].command[19].indexname "ew"
-indexinfo[0].command[19].command "stem:SHORTEST"
-indexinfo[0].command[20].indexname "ew"
-indexinfo[0].command[20].command "normalize"
-indexinfo[0].command[21].indexname "ew"
-indexinfo[0].command[21].command "plain-tokens"
-indexinfo[0].command[22].indexname "surl"
-indexinfo[0].command[22].command "index"
-indexinfo[0].command[23].indexname "userrate"
-indexinfo[0].command[23].command "index"
-indexinfo[0].command[24].indexname "userrate"
-indexinfo[0].command[24].command "numerical"
-indexinfo[0].command[25].indexname "pid"
-indexinfo[0].command[25].command "index"
-indexinfo[0].command[26].indexname "weight"
-indexinfo[0].command[26].command "index"
-indexinfo[0].command[27].indexname "weight"
-indexinfo[0].command[27].command "attribute"
-indexinfo[0].command[28].indexname "weight"
-indexinfo[0].command[28].command "numerical"
-indexinfo[0].command[29].indexname "url"
-indexinfo[0].command[29].command "index"
-indexinfo[0].command[30].indexname "isbn"
-indexinfo[0].command[30].command "index"
-indexinfo[0].command[31].indexname "fmt"
-indexinfo[0].command[31].command "index"
-indexinfo[0].command[32].indexname "fmt"
-indexinfo[0].command[32].command "lowercase"
-indexinfo[0].command[33].indexname "fmt"
-indexinfo[0].command[33].command "stem:SHORTEST"
-indexinfo[0].command[34].indexname "fmt"
-indexinfo[0].command[34].command "normalize"
-indexinfo[0].command[35].indexname "fmt"
-indexinfo[0].command[35].command "plain-tokens"
-indexinfo[0].command[36].indexname "albumid"
-indexinfo[0].command[36].command "index"
-indexinfo[0].command[37].indexname "disp_song"
-indexinfo[0].command[37].command "index"
-indexinfo[0].command[38].indexname "song"
-indexinfo[0].command[38].command "index"
-indexinfo[0].command[39].indexname "song"
-indexinfo[0].command[39].command "lowercase"
-indexinfo[0].command[40].indexname "song"
-indexinfo[0].command[40].command "stem:SHORTEST"
-indexinfo[0].command[41].indexname "song"
-indexinfo[0].command[41].command "normalize"
-indexinfo[0].command[42].indexname "song"
-indexinfo[0].command[42].command "plain-tokens"
-indexinfo[0].command[43].indexname "pfrom"
-indexinfo[0].command[43].command "index"
-indexinfo[0].command[44].indexname "pfrom"
-indexinfo[0].command[44].command "numerical"
-indexinfo[0].command[45].indexname "bgnpfrom"
-indexinfo[0].command[45].command "index"
-indexinfo[0].command[46].indexname "bgnpfrom"
-indexinfo[0].command[46].command "attribute"
-indexinfo[0].command[47].indexname "bgnpfrom"
-indexinfo[0].command[47].command "numerical"
-indexinfo[0].command[48].indexname "categories"
-indexinfo[0].command[48].command "index"
-indexinfo[0].command[49].indexname "categories"
-indexinfo[0].command[49].command "lowercase"
-indexinfo[0].command[50].indexname "categories"
-indexinfo[0].command[50].command "stem:SHORTEST"
-indexinfo[0].command[51].indexname "categories"
-indexinfo[0].command[51].command "normalize"
-indexinfo[0].command[52].indexname "categories"
-indexinfo[0].command[52].command "plain-tokens"
-indexinfo[0].command[53].indexname "data"
-indexinfo[0].command[53].command "index"
-indexinfo[0].command[54].indexname "numreview"
-indexinfo[0].command[54].command "index"
-indexinfo[0].command[55].indexname "numreview"
-indexinfo[0].command[55].command "numerical"
-indexinfo[0].command[56].indexname "bgnsellers"
-indexinfo[0].command[56].command "index"
-indexinfo[0].command[57].indexname "bgnsellers"
-indexinfo[0].command[57].command "numerical"
-indexinfo[0].command[58].indexname "image"
-indexinfo[0].command[58].command "index"
-indexinfo[0].command[59].indexname "artist"
-indexinfo[0].command[59].command "index"
-indexinfo[0].command[60].indexname "artist"
-indexinfo[0].command[60].command "lowercase"
-indexinfo[0].command[61].indexname "artist"
-indexinfo[0].command[61].command "stem:SHORTEST"
-indexinfo[0].command[62].indexname "artist"
-indexinfo[0].command[62].command "normalize"
-indexinfo[0].command[63].indexname "artist"
-indexinfo[0].command[63].command "plain-tokens"
-indexinfo[0].command[64].indexname "artistspid"
-indexinfo[0].command[64].command "index"
-indexinfo[0].command[65].indexname "title"
-indexinfo[0].command[65].command "index"
-indexinfo[0].command[66].indexname "title"
-indexinfo[0].command[66].command "lowercase"
-indexinfo[0].command[67].indexname "title"
-indexinfo[0].command[67].command "stem:SHORTEST"
-indexinfo[0].command[68].indexname "title"
-indexinfo[0].command[68].command "normalize"
-indexinfo[0].command[69].indexname "title"
-indexinfo[0].command[69].command "plain-tokens"
-indexinfo[0].command[70].indexname "newestedition"
-indexinfo[0].command[70].command "index"
-indexinfo[0].command[71].indexname "newestedition"
-indexinfo[0].command[71].command "attribute"
-indexinfo[0].command[72].indexname "newestedition"
-indexinfo[0].command[72].command "numerical"
-indexinfo[0].command[73].indexname "bgnpto"
-indexinfo[0].command[73].command "index"
-indexinfo[0].command[74].indexname "year"
-indexinfo[0].command[74].command "index"
-indexinfo[0].command[75].indexname "year"
-indexinfo[0].command[75].command "attribute"
-indexinfo[0].command[76].indexname "year"
-indexinfo[0].command[76].command "numerical"
-indexinfo[0].command[77].indexname "did"
-indexinfo[0].command[77].command "index"
-indexinfo[0].command[78].indexname "did"
-indexinfo[0].command[78].command "attribute"
-indexinfo[0].command[79].indexname "did"
-indexinfo[0].command[79].command "numerical"
-indexinfo[0].command[80].indexname "scorekey"
-indexinfo[0].command[80].command "index"
-indexinfo[0].command[81].indexname "scorekey"
-indexinfo[0].command[81].command "attribute"
-indexinfo[0].command[82].indexname "scorekey"
-indexinfo[0].command[82].command "numerical"
-indexinfo[0].command[83].indexname "cbid"
-indexinfo[0].command[83].command "index"
-indexinfo[0].command[84].indexname "cbid"
-indexinfo[0].command[84].command "attribute"
-indexinfo[0].command[85].indexname "cbid"
-indexinfo[0].command[85].command "numerical"
-indexinfo[0].command[86].indexname "rankfeatures"
-indexinfo[0].command[86].command "index"
-indexinfo[0].command[87].indexname "summaryfeatures"
-indexinfo[0].command[87].command "index"
-indexinfo[0].command[88].indexname "bgndata"
-indexinfo[0].command[88].command "dynteaser"
-indexinfo[0].command[89].indexname "ew"
-indexinfo[0].command[89].command "highlight"
-indexinfo[0].command[90].indexname "song"
-indexinfo[0].command[90].command "dynteaser"
-indexinfo[0].command[91].indexname "bgnpto"
-indexinfo[0].command[91].command "dynteaser"
-indexinfo[0].command[92].indexname "bgnpto"
-indexinfo[0].command[92].command "highlight"
-indexinfo[0].command[93].indexname "default"
-indexinfo[0].command[93].command "lowercase"
-indexinfo[0].command[94].indexname "default"
-indexinfo[0].command[94].command "index"
-indexinfo[0].command[95].indexname "default"
-indexinfo[0].command[95].command "plain-tokens"
-indexinfo[0].command[96].indexname "default"
-indexinfo[0].command[96].command "stem:SHORTEST"
-indexinfo[0].command[97].indexname "default"
-indexinfo[0].command[97].command "normalize"
\ No newline at end of file
+indexinfo[].name "newrank"
+indexinfo[].command[].indexname "sddocname"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "sddocname"
+indexinfo[].command[].command "word"
+indexinfo[].command[].indexname "bgndata"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "sales"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "sales"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "sales"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "pto"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "pto"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "pto"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "keys"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "keys"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "keys"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "keys"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "keys"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "mid"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "mid"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "mid"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "ew"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "ew"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "ew"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "ew"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "ew"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "surl"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "userrate"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "userrate"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "pid"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "weight"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "weight"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "weight"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "url"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "isbn"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "fmt"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "fmt"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "fmt"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "fmt"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "fmt"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "albumid"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "disp_song"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "song"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "song"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "song"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "song"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "song"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "pfrom"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "pfrom"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "bgnpfrom"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "bgnpfrom"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "bgnpfrom"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "categories"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "categories"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "categories"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "categories"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "categories"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "data"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "numreview"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "numreview"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "bgnsellers"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "bgnsellers"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "image"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "artist"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "artist"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "artist"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "artist"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "artist"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "artistspid"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "lowercase"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "normalize"
+indexinfo[].command[].indexname "title"
+indexinfo[].command[].command "plain-tokens"
+indexinfo[].command[].indexname "newestedition"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "newestedition"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "newestedition"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "bgnpto"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "year"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "year"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "year"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "did"
+indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "did"
+indexinfo[].command[].command "attribute"
+indexinfo[].command[].indexname "did"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[80].indexname "scorekey"
+indexinfo[].command[80].command "index"
+indexinfo[].command[81].indexname "scorekey"
+indexinfo[].command[81].command "attribute"
+indexinfo[].command[82].indexname "scorekey"
+indexinfo[].command[82].command "numerical"
+indexinfo[].command[83].indexname "cbid"
+indexinfo[].command[83].command "index"
+indexinfo[].command[84].indexname "cbid"
+indexinfo[].command[84].command "attribute"
+indexinfo[].command[85].indexname "cbid"
+indexinfo[].command[85].command "numerical"
+indexinfo[].command[86].indexname "rankfeatures"
+indexinfo[].command[86].command "index"
+indexinfo[].command[87].indexname "summaryfeatures"
+indexinfo[].command[87].command "index"
+indexinfo[].command[88].indexname "bgndata"
+indexinfo[].command[88].command "dynteaser"
+indexinfo[].command[89].indexname "ew"
+indexinfo[].command[89].command "highlight"
+indexinfo[].command[90].indexname "song"
+indexinfo[].command[90].command "dynteaser"
+indexinfo[].command[91].indexname "bgnpto"
+indexinfo[].command[91].command "dynteaser"
+indexinfo[].command[92].indexname "bgnpto"
+indexinfo[].command[92].command "highlight"
+indexinfo[].command[93].indexname "default"
+indexinfo[].command[93].command "lowercase"
+indexinfo[].command[94].indexname "default"
+indexinfo[].command[94].command "index"
+indexinfo[].command[95].indexname "default"
+indexinfo[].command[95].command "plain-tokens"
+indexinfo[].command[96].indexname "default"
+indexinfo[].command[96].command "stem:SHORTEST"
+indexinfo[].command[97].indexname "default"
+indexinfo[].command[97].command "normalize"
diff --git a/config-model/src/test/derived/newrank/juniperrc.cfg b/config-model/src/test/derived/newrank/juniperrc.cfg
index b5d7438e081..f5b2c166687 100755..100644
--- a/config-model/src/test/derived/newrank/juniperrc.cfg
+++ b/config-model/src/test/derived/newrank/juniperrc.cfg
@@ -8,14 +8,14 @@ winsize_fallback_multiplier 10.0
 max_match_candidates 1000
 stem_min_length 5
 stem_max_extend 3
-override[0].fieldname "ew"
-override[0].length 65536
-override[0].max_matches 1
-override[0].min_length 8192
-override[0].prefix true
-override[0].surround_max 65536
-override[0].winsize 200
-override[0].winsize_fallback_multiplier 10.0
-override[0].max_match_candidates 1000
-override[0].stem_min_length 5
-override[0].stem_max_extend 3
\ No newline at end of file
+override[].fieldname "ew"
+override[].length 65536
+override[].max_matches 1
+override[].min_length 8192
+override[].prefix true
+override[].surround_max 65536
+override[].winsize 200
+override[].winsize_fallback_multiplier 10.0
+override[].max_match_candidates 1000
+override[].stem_min_length 5
+override[].stem_max_extend 3
diff --git a/config-model/src/test/derived/newrank/rank-profiles.cfg b/config-model/src/test/derived/newrank/rank-profiles.cfg
index caca83a9a91..873d3c0cd49 100644
--- a/config-model/src/test/derived/newrank/rank-profiles.cfg
+++ b/config-model/src/test/derived/newrank/rank-profiles.cfg
@@ -1,10 +1,10 @@
-rankprofile[0].name "default"
-rankprofile[1].name "unranked"
-rankprofile[1].fef.property[0].name "vespa.rank.firstphase"
-rankprofile[1].fef.property[0].value "value(0)"
-rankprofile[1].fef.property[1].name "vespa.hitcollector.heapsize"
-rankprofile[1].fef.property[1].value "0"
-rankprofile[1].fef.property[2].name "vespa.hitcollector.arraysize"
-rankprofile[1].fef.property[2].value "0"
-rankprofile[1].fef.property[3].name "vespa.dump.ignoredefaultfeatures"
-rankprofile[1].fef.property[3].value "true"
\ No newline at end of file
+rankprofile[].name "default"
+rankprofile[].name "unranked"
+rankprofile[].fef.property[].name "vespa.rank.firstphase"
+rankprofile[].fef.property[].value "value(0)"
+rankprofile[].fef.property[].name "vespa.hitcollector.heapsize"
+rankprofile[].fef.property[].value "0"
+rankprofile[].fef.property[].name "vespa.hitcollector.arraysize"
+rankprofile[].fef.property[].value "0"
+rankprofile[].fef.property[].name "vespa.dump.ignoredefaultfeatures"
+rankprofile[].fef.property[].value "true"
diff --git a/config-model/src/test/derived/newrank/summary.cfg b/config-model/src/test/derived/newrank/summary.cfg
index 7cb5a695a5d..7cd92c26e02 100644
--- a/config-model/src/test/derived/newrank/summary.cfg
+++ b/config-model/src/test/derived/newrank/summary.cfg
@@ -1,97 +1,97 @@
 defaultsummaryid 912980235
-classes[0].id 912980235
-classes[0].name "default"
-classes[0].fields[0].name "bgndata"
-classes[0].fields[0].type "longstring"
-classes[0].fields[1].name "sales"
-classes[0].fields[1].type "integer"
-classes[0].fields[2].name "pto"
-classes[0].fields[2].type "integer"
-classes[0].fields[3].name "mid"
-classes[0].fields[3].type "integer"
-classes[0].fields[4].name "ew"
-classes[0].fields[4].type "longstring"
-classes[0].fields[5].name "surl"
-classes[0].fields[5].type "longstring"
-classes[0].fields[6].name "userrate"
-classes[0].fields[6].type "integer"
-classes[0].fields[7].name "pid"
-classes[0].fields[7].type "longstring"
-classes[0].fields[8].name "weight"
-classes[0].fields[8].type "float"
-classes[0].fields[9].name "url"
-classes[0].fields[9].type "longstring"
-classes[0].fields[10].name "isbn"
-classes[0].fields[10].type "longstring"
-classes[0].fields[11].name "fmt"
-classes[0].fields[11].type "longstring"
-classes[0].fields[12].name "albumid"
-classes[0].fields[12].type "longstring"
-classes[0].fields[13].name "disp_song"
-classes[0].fields[13].type "longstring"
-classes[0].fields[14].name "song"
-classes[0].fields[14].type "longstring"
-classes[0].fields[15].name "pfrom"
-classes[0].fields[15].type "integer"
-classes[0].fields[16].name "bgnpfrom"
-classes[0].fields[16].type "float"
-classes[0].fields[17].name "categories"
-classes[0].fields[17].type "longstring"
-classes[0].fields[18].name "data"
-classes[0].fields[18].type "longstring"
-classes[0].fields[19].name "numreview"
-classes[0].fields[19].type "integer"
-classes[0].fields[20].name "bgnsellers"
-classes[0].fields[20].type "integer"
-classes[0].fields[21].name "image"
-classes[0].fields[21].type "longstring"
-classes[0].fields[22].name "artist"
-classes[0].fields[22].type "longstring"
-classes[0].fields[23].name "artistspid"
-classes[0].fields[23].type "longstring"
-classes[0].fields[24].name "title"
-classes[0].fields[24].type "longstring"
-classes[0].fields[25].name "newestedition"
-classes[0].fields[25].type "integer"
-classes[0].fields[26].name "bgnpto"
-classes[0].fields[26].type "longstring"
-classes[0].fields[27].name "year"
-classes[0].fields[27].type "integer"
-classes[0].fields[28].name "did"
-classes[0].fields[28].type "integer"
-classes[0].fields[29].name "scorekey"
-classes[0].fields[29].type "integer"
-classes[0].fields[30].name "cbid"
-classes[0].fields[30].type "integer"
-classes[0].fields[31].name "rankfeatures"
-classes[0].fields[31].type "featuredata"
-classes[0].fields[32].name "summaryfeatures"
-classes[0].fields[32].type "featuredata"
-classes[0].fields[33].name "documentid"
-classes[0].fields[33].type "longstring"
-classes[1].id 1606815285
-classes[1].name "attributeprefetch"
-classes[1].fields[0].name "sales"
-classes[1].fields[0].type "integer"
-classes[1].fields[1].name "pto"
-classes[1].fields[1].type "integer"
-classes[1].fields[2].name "mid"
-classes[1].fields[2].type "integer"
-classes[1].fields[3].name "weight"
-classes[1].fields[3].type "float"
-classes[1].fields[4].name "bgnpfrom"
-classes[1].fields[4].type "float"
-classes[1].fields[5].name "newestedition"
-classes[1].fields[5].type "integer"
-classes[1].fields[6].name "year"
-classes[1].fields[6].type "integer"
-classes[1].fields[7].name "did"
-classes[1].fields[7].type "integer"
-classes[1].fields[8].name "scorekey"
-classes[1].fields[8].type "integer"
-classes[1].fields[9].name "cbid"
-classes[1].fields[9].type "integer"
-classes[1].fields[10].name "rankfeatures"
-classes[1].fields[10].type "featuredata"
-classes[1].fields[11].name "summaryfeatures"
-classes[1].fields[11].type "featuredata"
\ No newline at end of file
+classes[].id 912980235
+classes[].name "default"
+classes[].fields[].name "bgndata"
+classes[].fields[].type "longstring"
+classes[].fields[].name "sales"
+classes[].fields[].type "integer"
+classes[].fields[].name "pto"
+classes[].fields[].type "integer"
+classes[].fields[].name "mid"
+classes[].fields[].type "integer"
+classes[].fields[].name "ew"
+classes[].fields[].type "longstring"
+classes[].fields[].name "surl"
+classes[].fields[].type "longstring"
+classes[].fields[].name "userrate"
+classes[].fields[].type "integer"
+classes[].fields[].name "pid"
+classes[].fields[].type "longstring"
+classes[].fields[].name "weight"
+classes[].fields[].type "float"
+classes[].fields[].name "url"
+classes[].fields[].type "longstring"
+classes[].fields[].name "isbn"
+classes[].fields[].type "longstring"
+classes[].fields[].name "fmt"
+classes[].fields[].type "longstring"
+classes[].fields[].name "albumid"
+classes[].fields[].type "longstring"
+classes[].fields[].name "disp_song"
+classes[].fields[].type "longstring"
+classes[].fields[].name "song"
+classes[].fields[].type "longstring"
+classes[].fields[].name "pfrom"
+classes[].fields[].type "integer"
+classes[].fields[].name "bgnpfrom"
+classes[].fields[].type "float"
+classes[].fields[].name "categories"
+classes[].fields[].type "longstring"
+classes[].fields[].name "data"
+classes[].fields[].type "longstring"
+classes[].fields[].name "numreview"
+classes[].fields[].type "integer"
+classes[].fields[].name "bgnsellers"
+classes[].fields[].type "integer"
+classes[].fields[].name "image"
+classes[].fields[].type "longstring"
+classes[].fields[].name "artist"
+classes[].fields[].type "longstring"
+classes[].fields[].name "artistspid"
+classes[].fields[].type "longstring"
+classes[].fields[].name "title"
+classes[].fields[].type "longstring"
+classes[].fields[].name "newestedition"
+classes[].fields[].type "integer"
+classes[].fields[].name "bgnpto"
+classes[].fields[].type "longstring"
+classes[].fields[].name "year"
+classes[].fields[].type "integer"
+classes[].fields[].name "did"
+classes[].fields[].type "integer"
+classes[].fields[].name "scorekey"
+classes[].fields[].type "integer"
+classes[].fields[].name "cbid"
+classes[].fields[].type "integer"
+classes[].fields[].name "rankfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "summaryfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "documentid"
+classes[].fields[].type "longstring"
+classes[].id 1606815285
+classes[].name "attributeprefetch"
+classes[].fields[].name "sales"
+classes[].fields[].type "integer"
+classes[].fields[].name "pto"
+classes[].fields[].type "integer"
+classes[].fields[].name "mid"
+classes[].fields[].type "integer"
+classes[].fields[].name "weight"
+classes[].fields[].type "float"
+classes[].fields[].name "bgnpfrom"
+classes[].fields[].type "float"
+classes[].fields[].name "newestedition"
+classes[].fields[].type "integer"
+classes[].fields[].name "year"
+classes[].fields[].type "integer"
+classes[].fields[].name "did"
+classes[].fields[].type "integer"
+classes[].fields[].name "scorekey"
+classes[].fields[].type "integer"
+classes[].fields[].name "cbid"
+classes[].fields[].type "integer"
+classes[].fields[].name "rankfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].name "summaryfeatures"
+classes[].fields[].type "featuredata"
diff --git a/config-model/src/test/derived/newrank/summarymap.cfg b/config-model/src/test/derived/newrank/summarymap.cfg
index 1ba02ac9060..3350d892b0c 100644
--- a/config-model/src/test/derived/newrank/summarymap.cfg
+++ b/config-model/src/test/derived/newrank/summarymap.cfg
@@ -1,49 +1,49 @@
 defaultoutputclass -1
-override[0].field "bgndata"
-override[0].command "dynamicteaser"
-override[0].arguments "bgndata"
-override[1].field "sales"
-override[1].command "attribute"
-override[1].arguments "sales"
-override[2].field "pto"
-override[2].command "attribute"
-override[2].arguments "pto"
-override[3].field "mid"
-override[3].command "attribute"
-override[3].arguments "mid"
-override[4].field "ew"
-override[4].command "dynamicteaser"
-override[4].arguments "ew"
-override[5].field "weight"
-override[5].command "attribute"
-override[5].arguments "weight"
-override[6].field "song"
-override[6].command "dynamicteaser"
-override[6].arguments "song"
-override[7].field "bgnpfrom"
-override[7].command "attribute"
-override[7].arguments "bgnpfrom"
-override[8].field "newestedition"
-override[8].command "attribute"
-override[8].arguments "newestedition"
-override[9].field "bgnpto"
-override[9].command "dynamicteaser"
-override[9].arguments "bgnpto"
-override[10].field "year"
-override[10].command "attribute"
-override[10].arguments "year"
-override[11].field "did"
-override[11].command "attribute"
-override[11].arguments "did"
-override[12].field "scorekey"
-override[12].command "attribute"
-override[12].arguments "scorekey"
-override[13].field "cbid"
-override[13].command "attribute"
-override[13].arguments "cbid"
-override[14].field "rankfeatures"
-override[14].command "rankfeatures"
-override[14].arguments ""
-override[15].field "summaryfeatures"
-override[15].command "summaryfeatures"
-override[15].arguments ""
\ No newline at end of file
+override[].field "bgndata"
+override[].command "dynamicteaser"
+override[].arguments "bgndata"
+override[].field "sales"
+override[].command "attribute"
+override[].arguments "sales"
+override[].field "pto"
+override[].command "attribute"
+override[].arguments "pto"
+override[].field "mid"
+override[].command "attribute"
+override[].arguments "mid"
+override[].field "ew"
+override[].command "dynamicteaser"
+override[].arguments "ew"
+override[].field "weight"
+override[].command "attribute"
+override[].arguments "weight"
+override[].field "song"
+override[].command "dynamicteaser"
+override[].arguments "song"
+override[].field "bgnpfrom"
+override[].command "attribute"
+override[].arguments "bgnpfrom"
+override[].field "newestedition"
+override[].command "attribute"
+override[].arguments "newestedition"
+override[].field "bgnpto"
+override[].command "dynamicteaser"
+override[].arguments "bgnpto"
+override[].field "year"
+override[].command "attribute"
+override[].arguments "year"
+override[].field "did"
+override[].command "attribute"
+override[].arguments "did"
+override[].field "scorekey"
+override[].command "attribute"
+override[].arguments "scorekey"
+override[].field "cbid"
+override[].command "attribute"
+override[].arguments "cbid"
+override[].field "rankfeatures"
+override[].command "rankfeatures"
+override[].arguments ""
+override[].field "summaryfeatures"
+override[].command "summaryfeatures"
+override[].arguments ""