Forward multivalue information from parent field to individual struct indexes.

16 files changed, 220 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
index c1b698df55f..3fb185e333d 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
@@ -106,15 +106,18 @@ public class IndexInfo extends Derived {
     }
 
     private static boolean isPositionField(ImmutableSDField field) {
-        return GeoPos.isAnyPos(field);
+        return (field != null) && GeoPos.isAnyPos(field);
+    }
+    private static boolean isMultivalueField(ImmutableSDField field) {
+        return (field != null) && field.getDataType().isMultivalue();
     }
 
     @Override
     protected void derive(ImmutableSDField field, Schema schema) {
-        derive(field, schema, false);
+        derive(field, schema, null);
     }
 
-    protected void derive(ImmutableSDField field, Schema schema, boolean inPosition) {
+    protected void derive(ImmutableSDField field, Schema schema, ImmutableSDField parent) {
         if (field.getDataType().equals(DataType.PREDICATE)) {
             addIndexCommand(field, CMD_PREDICATE);
             Index index = field.getIndex(field.getName());
@@ -134,14 +137,13 @@ public class IndexInfo extends Derived {
             String name = e.getValue();
             addIndexAlias(alias, name);
         }
-        boolean isPosition = isPositionField(field);
         if (field.usesStructOrMap()) {
             for (ImmutableSDField structField : field.getStructFields()) {
-                derive(structField, schema, isPosition); // Recursion
+                derive(structField, schema, field); // Recursion
             }
         }
 
-        if (isPosition) {
+        if (isPositionField(field)) {
             addIndexCommand(field.getName(), CMD_DEFAULT_POSITION);
         }
 
@@ -153,12 +155,12 @@ public class IndexInfo extends Derived {
             addIndexCommand(field, CMD_LOWERCASE);
         }
 
-        if (field.getDataType().isMultivalue()) {
+        if (isMultivalueField(field) || isMultivalueField(parent)) {
             addIndexCommand(field, CMD_MULTIVALUE);
         }
 
         Attribute attribute = field.getAttribute();
-        if ((field.doesAttributing() || (attribute != null && !inPosition)) && !field.doesIndexing()) {
+        if ((field.doesAttributing() || (attribute != null && !isPositionField(parent))) && !field.doesIndexing()) {
             addIndexCommand(field.getName(), CMD_ATTRIBUTE);
             if (attribute != null && attribute.isFastSearch())
                 addIndexCommand(field.getName(), CMD_FAST_SEARCH);
diff --git a/config-model/src/test/derived/array_of_struct_attribute/index-info.cfg b/config-model/src/test/derived/array_of_struct_attribute/index-info.cfg
index 0927045528d..a4fbe6f6c39 100644
--- a/config-model/src/test/derived/array_of_struct_attribute/index-info.cfg
+++ b/config-model/src/test/derived/array_of_struct_attribute/index-info.cfg
@@ -6,6 +6,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "elem_array.name"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "elem_array.name"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "elem_array.name"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "elem_array.name"
 indexinfo[].command[].command "fast-search"
@@ -16,6 +18,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "elem_array.name"
 indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "elem_array.weight"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "elem_array.weight"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "elem_array.weight"
 indexinfo[].command[].command "numerical"
diff --git a/config-model/src/test/derived/exactmatch/index-info.cfg b/config-model/src/test/derived/exactmatch/index-info.cfg
index 4a9ba85ad38..73a80d3510e 100644
--- a/config-model/src/test/derived/exactmatch/index-info.cfg
+++ b/config-model/src/test/derived/exactmatch/index-info.cfg
@@ -22,6 +22,8 @@ indexinfo[].command[].command "exact *!A!!*"
 indexinfo[].command[].indexname "string_map.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "string_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "string_map.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "string_map.key"
 indexinfo[].command[].command "string"
@@ -30,6 +32,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "string_map.key"
 indexinfo[].command[].command "exact *!B!!*"
 indexinfo[].command[].indexname "string_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "string_map.value"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "string_map.value"
 indexinfo[].command[].command "type string"
@@ -38,6 +42,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "string_map"
 indexinfo[].command[].command "type Map<string,string>"
 indexinfo[].command[].indexname "elem_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "elem_map.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "elem_map.key"
 indexinfo[].command[].command "type string"
@@ -58,6 +64,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "elem_map.value.weight"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "elem_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "elem_map.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "elem_map"
 indexinfo[].command[].command "multivalue"
@@ -66,6 +74,8 @@ indexinfo[].command[].command "type Map<string,elem>"
 indexinfo[].command[].indexname "elem_array.name"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "elem_array.name"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "elem_array.name"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "elem_array.name"
 indexinfo[].command[].command "string"
@@ -74,6 +84,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "elem_array.name"
 indexinfo[].command[].command "exact @@"
 indexinfo[].command[].indexname "elem_array.weight"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "elem_array.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "elem_array.weight"
 indexinfo[].command[].command "integer"
@@ -84,6 +96,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "elem_array"
 indexinfo[].command[].command "type Array<elem>"
 indexinfo[].command[].indexname "another_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "another_map.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "another_map.key"
 indexinfo[].command[].command "type string"
@@ -104,6 +118,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "another_map.value.weight"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "another_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "another_map.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "another_map"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/imported_struct_fields/index-info.cfg b/config-model/src/test/derived/imported_struct_fields/index-info.cfg
index 2b8a6fc344d..7c808c932b2 100644
--- a/config-model/src/test/derived/imported_struct_fields/index-info.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/index-info.cfg
@@ -12,6 +12,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "my_elem_array.name"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "my_elem_array.name"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_elem_array.name"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_elem_array.name"
 indexinfo[].command[].command "fast-search"
@@ -22,6 +24,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "my_elem_array.name"
 indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "my_elem_array.weight"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_elem_array.weight"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_elem_array.weight"
 indexinfo[].command[].command "numerical"
@@ -54,10 +58,14 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "my_elem_map.value.weight"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "my_elem_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_elem_map.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "my_elem_map.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "my_elem_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_elem_map.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_elem_map.key"
 indexinfo[].command[].command "fast-search"
@@ -74,6 +82,8 @@ indexinfo[].command[].command "type Map<string,elem>"
 indexinfo[].command[].indexname "my_str_int_map.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "my_str_int_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_str_int_map.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_str_int_map.key"
 indexinfo[].command[].command "fast-search"
@@ -84,6 +94,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "my_str_int_map.key"
 indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "my_str_int_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "my_str_int_map.value"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_str_int_map.value"
 indexinfo[].command[].command "numerical"
diff --git a/config-model/src/test/derived/indexschema/index-info.cfg b/config-model/src/test/derived/indexschema/index-info.cfg
index 8c2349e37ea..e764fea8d1f 100644
--- a/config-model/src/test/derived/indexschema/index-info.cfg
+++ b/config-model/src/test/derived/indexschema/index-info.cfg
@@ -260,6 +260,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "f10.text"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "f10.text"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "f10.text"
 indexinfo[].command[].command "stem:BEST"
 indexinfo[].command[].indexname "f10.text"
 indexinfo[].command[].command "normalize"
@@ -270,6 +272,8 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "f10.text"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "f10.name"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "f10.name"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "f10.name"
 indexinfo[].command[].command "type string"
diff --git a/config-model/src/test/derived/map_attribute/index-info.cfg b/config-model/src/test/derived/map_attribute/index-info.cfg
index 64a51db1edd..be9612ba293 100644
--- a/config-model/src/test/derived/map_attribute/index-info.cfg
+++ b/config-model/src/test/derived/map_attribute/index-info.cfg
@@ -6,6 +6,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "str_map.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "str_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "str_map.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "str_map.key"
 indexinfo[].command[].command "fast-search"
@@ -18,6 +20,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "str_map.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "str_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "str_map.value"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "str_map.value"
 indexinfo[].command[].command "string"
@@ -30,6 +34,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "str_map"
 indexinfo[].command[].command "type Map<string,string>"
 indexinfo[].command[].indexname "int_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "int_map.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "int_map.key"
 indexinfo[].command[].command "numerical"
@@ -38,6 +44,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "int_map.key"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "int_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "int_map.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "int_map.value"
 indexinfo[].command[].command "integer"
diff --git a/config-model/src/test/derived/map_of_struct_attribute/index-info.cfg b/config-model/src/test/derived/map_of_struct_attribute/index-info.cfg
index b649fa2aa8a..5f414f14420 100644
--- a/config-model/src/test/derived/map_of_struct_attribute/index-info.cfg
+++ b/config-model/src/test/derived/map_of_struct_attribute/index-info.cfg
@@ -6,6 +6,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "str_elem_map.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "str_elem_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "str_elem_map.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "str_elem_map.key"
 indexinfo[].command[].command "fast-search"
@@ -34,12 +36,16 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "str_elem_map.value.weight"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "str_elem_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "str_elem_map.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "str_elem_map"
 indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "str_elem_map"
 indexinfo[].command[].command "type Map<string,elem>"
 indexinfo[].command[].indexname "int_elem_map.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "int_elem_map.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "int_elem_map.key"
 indexinfo[].command[].command "numerical"
@@ -66,6 +72,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "int_elem_map.value.weight"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "int_elem_map.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "int_elem_map.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "int_elem_map"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/matchsettings_map_after/index-info.cfg b/config-model/src/test/derived/matchsettings_map_after/index-info.cfg
index e91784db387..f96bc5ad99f 100644
--- a/config-model/src/test/derived/matchsettings_map_after/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_map_after/index-info.cfg
@@ -4,6 +4,8 @@ indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "sddocname"
 indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "mse4.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse4.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mse4.key"
 indexinfo[].command[].command "type string"
@@ -24,6 +26,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse4.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse4.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "mse4"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/matchsettings_map_def/index-info.cfg b/config-model/src/test/derived/matchsettings_map_def/index-info.cfg
index 1304354a722..22214e83698 100644
--- a/config-model/src/test/derived/matchsettings_map_def/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_map_def/index-info.cfg
@@ -6,6 +6,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mss3.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "stem:BEST"
 indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "normalize"
@@ -18,6 +20,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mss3.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "stem:BEST"
 indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "normalize"
@@ -36,6 +40,8 @@ indexinfo[].command[].command "plain-tokens"
 indexinfo[].command[].indexname "mss3"
 indexinfo[].command[].command "type Map<string,string>"
 indexinfo[].command[].indexname "mse4.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse4.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mse4.key"
 indexinfo[].command[].command "type string"
@@ -52,6 +58,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse4.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse4.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "mse4"
 indexinfo[].command[].command "multivalue"
@@ -60,6 +68,8 @@ indexinfo[].command[].command "type Map<string,elem>"
 indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mse5.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "fast-search"
@@ -88,6 +98,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse5.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse5.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "mse5"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/matchsettings_map_in_struct/index-info.cfg b/config-model/src/test/derived/matchsettings_map_in_struct/index-info.cfg
index 75273abefa1..c0d16de6393 100644
--- a/config-model/src/test/derived/matchsettings_map_in_struct/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_map_in_struct/index-info.cfg
@@ -16,6 +16,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "stuff.cf5e1.sf2m.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stuff.cf5e1.sf2m.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stuff.cf5e1.sf2m.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "stuff.cf5e1.sf2m.key"
 indexinfo[].command[].command "string"
@@ -26,6 +28,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "stuff.cf5e1.sf2m.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stuff.cf5e1.sf2m.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stuff.cf5e1.sf2m.value"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "stuff.cf5e1.sf2m.value"
 indexinfo[].command[].command "string"
@@ -50,6 +54,8 @@ indexinfo[].command[].command "exact @elem@"
 indexinfo[].command[].indexname "stuff.cf5e1.sf4m.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stuff.cf5e1.sf4m.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stuff.cf5e1.sf4m.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "stuff.cf5e1.sf4m.key"
 indexinfo[].command[].command "string"
@@ -60,6 +66,8 @@ indexinfo[].command[].command "exact @elem@"
 indexinfo[].command[].indexname "stuff.cf5e1.sf4m.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stuff.cf5e1.sf4m.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stuff.cf5e1.sf4m.value"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "stuff.cf5e1.sf4m.value"
 indexinfo[].command[].command "string"
@@ -88,6 +96,8 @@ indexinfo[].command[].command "exact @combi@"
 indexinfo[].command[].indexname "stuff.cf6e2.sf2m.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stuff.cf6e2.sf2m.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stuff.cf6e2.sf2m.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "stuff.cf6e2.sf2m.key"
 indexinfo[].command[].command "string"
@@ -98,6 +108,8 @@ indexinfo[].command[].command "exact @combi@"
 indexinfo[].command[].indexname "stuff.cf6e2.sf2m.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stuff.cf6e2.sf2m.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stuff.cf6e2.sf2m.value"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "stuff.cf6e2.sf2m.value"
 indexinfo[].command[].command "string"
@@ -124,6 +136,8 @@ indexinfo[].command[].command "exact @elem@"
 indexinfo[].command[].indexname "stuff.cf6e2.sf4m.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stuff.cf6e2.sf4m.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stuff.cf6e2.sf4m.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "stuff.cf6e2.sf4m.key"
 indexinfo[].command[].command "string"
@@ -134,6 +148,8 @@ indexinfo[].command[].command "exact @elem@"
 indexinfo[].command[].indexname "stuff.cf6e2.sf4m.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stuff.cf6e2.sf4m.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stuff.cf6e2.sf4m.value"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "stuff.cf6e2.sf4m.value"
 indexinfo[].command[].command "string"
diff --git a/config-model/src/test/derived/matchsettings_map_wfs/index-info.cfg b/config-model/src/test/derived/matchsettings_map_wfs/index-info.cfg
index 2ef04a85a4f..51c13848a05 100644
--- a/config-model/src/test/derived/matchsettings_map_wfs/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_map_wfs/index-info.cfg
@@ -6,6 +6,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mss3.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "type string"
@@ -14,6 +16,8 @@ indexinfo[].command[].command "exact @mss3_key@"
 indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mss3.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "type string"
@@ -28,6 +32,8 @@ indexinfo[].command[].command "plain-tokens"
 indexinfo[].command[].indexname "mss3"
 indexinfo[].command[].command "type Map<string,string>"
 indexinfo[].command[].indexname "mse4.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse4.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mse4.key"
 indexinfo[].command[].command "type string"
@@ -48,6 +54,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse4.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse4.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "mse4"
 indexinfo[].command[].command "multivalue"
@@ -56,6 +64,8 @@ indexinfo[].command[].command "type Map<string,elem>"
 indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mse5.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "fast-search"
@@ -84,6 +94,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse5.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse5.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "mse5"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/matchsettings_map_wss/index-info.cfg b/config-model/src/test/derived/matchsettings_map_wss/index-info.cfg
index cf6a2fc5992..c4cf9cd2f1e 100644
--- a/config-model/src/test/derived/matchsettings_map_wss/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_map_wss/index-info.cfg
@@ -6,6 +6,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mss3.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "stem:BEST"
 indexinfo[].command[].indexname "mss3.key"
 indexinfo[].command[].command "normalize"
@@ -18,6 +20,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mss3.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "stem:BEST"
 indexinfo[].command[].indexname "mss3.value"
 indexinfo[].command[].command "normalize"
@@ -36,6 +40,8 @@ indexinfo[].command[].command "plain-tokens"
 indexinfo[].command[].indexname "mss3"
 indexinfo[].command[].command "type Map<string,string>"
 indexinfo[].command[].indexname "mse4.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse4.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mse4.key"
 indexinfo[].command[].command "type string"
@@ -54,6 +60,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse4.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse4.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "mse4"
 indexinfo[].command[].command "multivalue"
@@ -62,6 +70,8 @@ indexinfo[].command[].command "type Map<string,elem>"
 indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "mse5.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse5.key"
 indexinfo[].command[].command "fast-search"
@@ -90,6 +100,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse5.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mse5.value"
 indexinfo[].command[].command "type elem"
 indexinfo[].command[].indexname "mse5"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/position_array/index-info.cfg b/config-model/src/test/derived/position_array/index-info.cfg
index 5484964149e..65587820bc1 100644
--- a/config-model/src/test/derived/position_array/index-info.cfg
+++ b/config-model/src/test/derived/position_array/index-info.cfg
@@ -4,12 +4,16 @@ indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "sddocname"
 indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "pos.x"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "pos.x"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pos.x"
 indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "pos.x"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pos.y"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "pos.y"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pos.y"
 indexinfo[].command[].command "integer"
diff --git a/config-model/src/test/derived/structandfieldset/index-info.cfg b/config-model/src/test/derived/structandfieldset/index-info.cfg
index 87a95f5a908..0a423530cfa 100644
--- a/config-model/src/test/derived/structandfieldset/index-info.cfg
+++ b/config-model/src/test/derived/structandfieldset/index-info.cfg
@@ -16,6 +16,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "people.first_name"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "people.first_name"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "people.first_name"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "people.first_name"
 indexinfo[].command[].command "string"
@@ -26,6 +28,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "people.last_name"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "people.last_name"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "people.last_name"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "people.last_name"
 indexinfo[].command[].command "string"
diff --git a/config-model/src/test/derived/structanyorder/index-info.cfg b/config-model/src/test/derived/structanyorder/index-info.cfg
index 6ea63818572..43dc6312d3e 100644
--- a/config-model/src/test/derived/structanyorder/index-info.cfg
+++ b/config-model/src/test/derived/structanyorder/index-info.cfg
@@ -180,10 +180,14 @@ indexinfo[].command[].command "type foo"
 indexinfo[].command[].indexname "structfield"
 indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s1"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "structarrayfield.s1"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "structarrayfield.s1"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "structarrayfield.s2"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "structarrayfield.s2"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "structarrayfield.s2"
 indexinfo[].command[].command "type string"
@@ -344,6 +348,8 @@ indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s4"
 indexinfo[].command[].command "type foo"
 indexinfo[].command[].indexname "structarrayfield.s3"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "structarrayfield.s3"
 indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s4.s1"
 indexinfo[].command[].command "numerical"
@@ -352,6 +358,8 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "structarrayfield.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s4"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "structarrayfield.s4"
 indexinfo[].command[].command "type foo"
 indexinfo[].command[].indexname "structarrayfield"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/types/index-info.cfg b/config-model/src/test/derived/types/index-info.cfg
index cc49e006f98..6b39e4d1924 100644
--- a/config-model/src/test/derived/types/index-info.cfg
+++ b/config-model/src/test/derived/types/index-info.cfg
@@ -96,10 +96,14 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "structfield"
 indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s1"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "structarrayfield.s1"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "structarrayfield.s1"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "structarrayfield.s2"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "structarrayfield.s2"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "structarrayfield.s2"
 indexinfo[].command[].command "type string"
@@ -110,6 +114,8 @@ indexinfo[].command[].command "type Array<sct>"
 indexinfo[].command[].indexname "stringmapfield.key"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stringmapfield.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stringmapfield.key"
 indexinfo[].command[].command "stem:BEST"
 indexinfo[].command[].indexname "stringmapfield.key"
 indexinfo[].command[].command "normalize"
@@ -122,6 +128,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "stringmapfield.value"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "stringmapfield.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "stringmapfield.value"
 indexinfo[].command[].command "stem:BEST"
 indexinfo[].command[].indexname "stringmapfield.value"
 indexinfo[].command[].command "normalize"
@@ -140,10 +148,14 @@ indexinfo[].command[].command "plain-tokens"
 indexinfo[].command[].indexname "stringmapfield"
 indexinfo[].command[].command "type Map<string,string>"
 indexinfo[].command[].indexname "intmapfield.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "intmapfield.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "intmapfield.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "intmapfield.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "intmapfield.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "intmapfield.value"
 indexinfo[].command[].command "integer"
@@ -154,10 +166,14 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "intmapfield"
 indexinfo[].command[].command "type Map<string,int>"
 indexinfo[].command[].indexname "floatmapfield.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "floatmapfield.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "floatmapfield.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "floatmapfield.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "floatmapfield.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "floatmapfield.value"
 indexinfo[].command[].command "type float"
@@ -166,12 +182,16 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "floatmapfield"
 indexinfo[].command[].command "type Map<string,float>"
 indexinfo[].command[].indexname "longmapfield.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "longmapfield.key"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "longmapfield.key"
 indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "longmapfield.key"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "longmapfield.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "longmapfield.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "longmapfield.value"
 indexinfo[].command[].command "integer"
@@ -182,12 +202,16 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "longmapfield"
 indexinfo[].command[].command "type Map<int,long>"
 indexinfo[].command[].indexname "doublemapfield.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "doublemapfield.key"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "doublemapfield.key"
 indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "doublemapfield.key"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "doublemapfield.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "doublemapfield.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "doublemapfield.value"
 indexinfo[].command[].command "type double"
@@ -196,6 +220,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "doublemapfield"
 indexinfo[].command[].command "type Map<int,double>"
 indexinfo[].command[].indexname "arraymapfield.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "arraymapfield.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "arraymapfield.key"
 indexinfo[].command[].command "type string"
@@ -232,10 +258,14 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mystructfield.bytearr"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "mystructfield.mymap.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructfield.mymap.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructfield.mymap.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "mystructfield.mymap.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructfield.mymap.value"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructfield.mymap.value"
 indexinfo[].command[].command "type string"
@@ -254,6 +284,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "mystructfield"
 indexinfo[].command[].command "type mystruct"
 indexinfo[].command[].indexname "mystructmap.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructmap.key"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mystructmap.key"
 indexinfo[].command[].command "integer"
@@ -268,10 +300,14 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mystructmap.value.bytearr"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "mystructmap.value.mymap.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructmap.value.mymap.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructmap.value.mymap.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "mystructmap.value.mymap.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructmap.value.mymap.value"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructmap.value.mymap.value"
 indexinfo[].command[].command "type string"
@@ -288,6 +324,8 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructmap.value.structfield"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "mystructmap.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructmap.value"
 indexinfo[].command[].command "type mystruct"
 indexinfo[].command[].indexname "mystructmap"
 indexinfo[].command[].command "multivalue"
@@ -302,10 +340,14 @@ indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "mystructarr.bytearr"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "mystructarr.mymap.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructarr.mymap.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructarr.mymap.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "mystructarr.mymap.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructarr.mymap.value"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructarr.mymap.value"
 indexinfo[].command[].command "type string"
@@ -314,10 +356,14 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "mystructarr.mymap"
 indexinfo[].command[].command "type Map<string,string>"
 indexinfo[].command[].indexname "mystructarr.title"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructarr.title"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructarr.title"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "mystructarr.structfield"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "mystructarr.structfield"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "mystructarr.structfield"
 indexinfo[].command[].command "type string"
@@ -326,6 +372,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "mystructarr"
 indexinfo[].command[].command "type Array<mystruct>"
 indexinfo[].command[].indexname "Folders.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.key"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.key"
 indexinfo[].command[].command "integer"
@@ -342,10 +390,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -366,10 +418,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -390,10 +446,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -414,10 +474,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -438,10 +502,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -462,10 +530,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -486,10 +558,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -510,10 +586,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -534,10 +614,14 @@ indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.key"
 indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "integer"
@@ -566,6 +650,8 @@ indexinfo[].command[].command "type folder"
 indexinfo[].command[].indexname "Folders.value.anotherfolder"
 indexinfo[].command[].command "type folder"
 indexinfo[].command[].indexname "Folders.value"
+indexinfo[].command[].command "multivalue"
+indexinfo[].command[].indexname "Folders.value"
 indexinfo[].command[].command "type folder"
 indexinfo[].command[].indexname "Folders"
 indexinfo[].command[].command "multivalue"