Limit yql in operator to string and integer fields.

32 files changed, 301 insertions, 1 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 a1a358e96cd..7afa2b46693 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
@@ -52,6 +52,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
     private static final String CMD_PREDICATE = "predicate";
     private static final String CMD_PREDICATE_BOUNDS = "predicate-bounds";
     private static final String CMD_NUMERICAL = "numerical";
+    private static final String CMD_INTEGER = "integer";
     private static final String CMD_STRING = "string";
     private static final String CMD_PHRASE_SEGMENTING = "phrase-segmenting";
     private final Set<IndexCommand> commands = new java.util.LinkedHashSet<>();
@@ -172,9 +173,12 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
         if (isUriField(field)) {
             addUriIndexCommands(field);
         }
-
         if (field.getDataType().getPrimitiveType() instanceof NumericDataType) {
             addIndexCommand(field, CMD_NUMERICAL);
+            if (isTypeOrNested(field, DataType.INT) || isTypeOrNested(field, DataType.LONG) ||
+                    isTypeOrNested(field, DataType.BYTE)) {
+                addIndexCommand(field, CMD_INTEGER);
+            }
         }
         if (isTypeOrNested(field, DataType.STRING)) {
             addIndexCommand(field, CMD_STRING);
diff --git a/config-model/src/test/derived/advanced/index-info.cfg b/config-model/src/test/derived/advanced/index-info.cfg
index 0d24150aa0f..a6405270c74 100644
--- a/config-model/src/test/derived/advanced/index-info.cfg
+++ b/config-model/src/test/derived/advanced/index-info.cfg
@@ -54,10 +54,14 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "location.x"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "location.x"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "location.x"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "location.y"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "location.y"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "location.y"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "location"
 indexinfo[].command[].command "default-position"
@@ -70,6 +74,8 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "location_zcurve"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "location_zcurve"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "location_zcurve"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "mysummary"
 indexinfo[].command[].command "string"
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 856dc94c6e5..0927045528d 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
@@ -20,6 +20,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "elem_array.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "elem_array.weight"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "elem_array.weight"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "elem_array"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/arrays/index-info.cfg b/config-model/src/test/derived/arrays/index-info.cfg
index c767cbe2cd1..e227afccb36 100644
--- a/config-model/src/test/derived/arrays/index-info.cfg
+++ b/config-model/src/test/derived/arrays/index-info.cfg
@@ -24,6 +24,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "ratings"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "ratings"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "ratings"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "a"
 indexinfo[].command[].command "lowercase"
diff --git a/config-model/src/test/derived/attributeprefetch/index-info.cfg b/config-model/src/test/derived/attributeprefetch/index-info.cfg
index 00121f7a800..660a6b471fe 100644
--- a/config-model/src/test/derived/attributeprefetch/index-info.cfg
+++ b/config-model/src/test/derived/attributeprefetch/index-info.cfg
@@ -8,6 +8,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "singlebyte"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "singlebyte"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "singlebyte"
 indexinfo[].command[].command "type byte"
 indexinfo[].command[].indexname "multibyte"
 indexinfo[].command[].command "multivalue"
@@ -16,6 +18,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "multibyte"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "multibyte"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "multibyte"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "wsbyte"
 indexinfo[].command[].command "multivalue"
@@ -24,12 +28,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "wsbyte"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "wsbyte"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "wsbyte"
 indexinfo[].command[].command "type WeightedSet<byte>"
 indexinfo[].command[].indexname "singleint"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "singleint"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "singleint"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "singleint"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "multiint"
 indexinfo[].command[].command "multivalue"
@@ -38,6 +46,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "multiint"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "multiint"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "multiint"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "wsint"
 indexinfo[].command[].command "multivalue"
@@ -46,12 +56,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "wsint"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "wsint"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "wsint"
 indexinfo[].command[].command "type WeightedSet<int>"
 indexinfo[].command[].indexname "singlelong"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "singlelong"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "singlelong"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "singlelong"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "multilong"
 indexinfo[].command[].command "multivalue"
@@ -60,6 +74,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "multilong"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "multilong"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "multilong"
 indexinfo[].command[].command "type Array<long>"
 indexinfo[].command[].indexname "wslong"
 indexinfo[].command[].command "multivalue"
@@ -68,6 +84,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "wslong"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "wslong"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "wslong"
 indexinfo[].command[].command "type WeightedSet<long>"
 indexinfo[].command[].indexname "singlefloat"
 indexinfo[].command[].command "attribute"
diff --git a/config-model/src/test/derived/attributes/index-info.cfg b/config-model/src/test/derived/attributes/index-info.cfg
index 9cf0342dae6..1d4e8f485b3 100644
--- a/config-model/src/test/derived/attributes/index-info.cfg
+++ b/config-model/src/test/derived/attributes/index-info.cfg
@@ -104,12 +104,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "b4"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "b4"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "b4"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "b5"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "b5"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "b5"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "b5"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "b6"
 indexinfo[].command[].command "multivalue"
@@ -118,6 +122,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "b6"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "b6"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "b6"
 indexinfo[].command[].command "type Array<long>"
 indexinfo[].command[].indexname "b7"
 indexinfo[].command[].command "multivalue"
@@ -126,12 +132,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "b7"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "b7"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "b7"
 indexinfo[].command[].command "type WeightedSet<int>"
 indexinfo[].command[].indexname "a9"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "a9"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "a9"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "a9"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "a10"
 indexinfo[].command[].command "multivalue"
@@ -142,18 +152,24 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "a10"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "a10"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "a10"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "a11"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "a11"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "a11"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "a11"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "a12"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "a12"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "a12"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "a12"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "a13"
 indexinfo[].command[].command "attribute"
diff --git a/config-model/src/test/derived/exactmatch/index-info.cfg b/config-model/src/test/derived/exactmatch/index-info.cfg
index 7198e1401ae..4a9ba85ad38 100644
--- a/config-model/src/test/derived/exactmatch/index-info.cfg
+++ b/config-model/src/test/derived/exactmatch/index-info.cfg
@@ -54,6 +54,8 @@ indexinfo[].command[].command "exact @@"
 indexinfo[].command[].indexname "elem_map.value.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "elem_map.value.weight"
+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 "type elem"
@@ -74,6 +76,8 @@ indexinfo[].command[].command "exact @@"
 indexinfo[].command[].indexname "elem_array.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "elem_array.weight"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "elem_array.weight"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "elem_array"
 indexinfo[].command[].command "multivalue"
@@ -96,6 +100,8 @@ indexinfo[].command[].command "exact *!C!!*"
 indexinfo[].command[].indexname "another_map.value.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "another_map.value.weight"
+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 "type elem"
diff --git a/config-model/src/test/derived/imported_position_field/index-info.cfg b/config-model/src/test/derived/imported_position_field/index-info.cfg
index 7e51b268593..84493520aa1 100644
--- a/config-model/src/test/derived/imported_position_field/index-info.cfg
+++ b/config-model/src/test/derived/imported_position_field/index-info.cfg
@@ -16,6 +16,8 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "my_pos_zcurve"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_pos_zcurve"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "my_pos_zcurve"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "my_pos"
 indexinfo[].command[].command "default-position"
diff --git a/config-model/src/test/derived/imported_position_field_summary/index-info.cfg b/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
index 7e51b268593..84493520aa1 100644
--- a/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
+++ b/config-model/src/test/derived/imported_position_field_summary/index-info.cfg
@@ -16,6 +16,8 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "my_pos_zcurve"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_pos_zcurve"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "my_pos_zcurve"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "my_pos"
 indexinfo[].command[].command "default-position"
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 547123754cf..f023328380c 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
@@ -30,6 +30,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_elem_array.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_elem_array.weight"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "my_elem_array.weight"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "my_elem_array"
 indexinfo[].command[].command "multivalue"
@@ -52,6 +54,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_elem_map.value.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_elem_map.value.weight"
+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 "type elem"
@@ -88,6 +92,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_str_int_map.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_str_int_map.value"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "my_str_int_map.value"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "my_str_int_map"
 indexinfo[].command[].command "multivalue"
diff --git a/config-model/src/test/derived/importedfields/index-info.cfg b/config-model/src/test/derived/importedfields/index-info.cfg
index 456605367c0..830249b94db 100644
--- a/config-model/src/test/derived/importedfields/index-info.cfg
+++ b/config-model/src/test/derived/importedfields/index-info.cfg
@@ -26,6 +26,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_int_field"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_int_field"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "my_int_field"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "my_string_field"
 indexinfo[].command[].command "lowercase"
@@ -44,6 +46,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_int_array_field"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_int_array_field"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "my_int_array_field"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "my_int_wset_field"
 indexinfo[].command[].command "multivalue"
@@ -52,12 +56,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_int_wset_field"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_int_wset_field"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "my_int_wset_field"
 indexinfo[].command[].command "type WeightedSet<int>"
 indexinfo[].command[].indexname "my_ancient_int_field"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_ancient_int_field"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "my_ancient_int_field"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "my_ancient_int_field"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "myfieldset"
 indexinfo[].command[].command "lowercase"
diff --git a/config-model/src/test/derived/indexschema/index-info.cfg b/config-model/src/test/derived/indexschema/index-info.cfg
index 053066d9dcb..3de7adcb930 100644
--- a/config-model/src/test/derived/indexschema/index-info.cfg
+++ b/config-model/src/test/derived/indexschema/index-info.cfg
@@ -58,10 +58,14 @@ indexinfo[].command[].command "literal-boost"
 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 "numerical"
 indexinfo[].command[].indexname "pos.y"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos.y"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pos"
 indexinfo[].command[].command "default-position"
@@ -178,18 +182,24 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "ia"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "ia"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "ia"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "ib"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "ib"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "ib"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "ib"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "ic"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "ic"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "ic"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "ic"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "nostemstring1"
 indexinfo[].command[].command "index"
@@ -274,6 +284,8 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pos_zcurve"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "sd_literal"
 indexinfo[].command[].command "lowercase"
@@ -290,6 +302,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "searchfield2"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "searchfield2"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "searchfield2"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "sh.fragment"
 indexinfo[].command[].command "string"
diff --git a/config-model/src/test/derived/inheritance/index-info.cfg b/config-model/src/test/derived/inheritance/index-info.cfg
index 4b5cacfc5ad..a11b6a53496 100644
--- a/config-model/src/test/derived/inheritance/index-info.cfg
+++ b/config-model/src/test/derived/inheritance/index-info.cfg
@@ -8,12 +8,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "onlygrandparent"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "onlygrandparent"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "onlygrandparent"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "overridden"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "overridden"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "overridden"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "overridden"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "onlyfather"
 indexinfo[].command[].command "string"
diff --git a/config-model/src/test/derived/inheritstruct/index-info.cfg b/config-model/src/test/derived/inheritstruct/index-info.cfg
index fd348211719..c37b0312099 100644
--- a/config-model/src/test/derived/inheritstruct/index-info.cfg
+++ b/config-model/src/test/derived/inheritstruct/index-info.cfg
@@ -24,6 +24,8 @@ indexinfo[].command[].command "type my_struct"
 indexinfo[].command[].indexname "other_field.my_int"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "other_field.my_int"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "other_field.my_int"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "other_field.my_str"
 indexinfo[].command[].command "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 00cbc13edca..64a51db1edd 100644
--- a/config-model/src/test/derived/map_attribute/index-info.cfg
+++ b/config-model/src/test/derived/map_attribute/index-info.cfg
@@ -34,10 +34,14 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "int_map.key"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "int_map.key"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "int_map.key"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "int_map.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "int_map.value"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "int_map.value"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "int_map"
 indexinfo[].command[].command "multivalue"
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 202f361a3cd..b649fa2aa8a 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
@@ -30,6 +30,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "str_elem_map.value.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "str_elem_map.value.weight"
+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 "type elem"
@@ -42,6 +44,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "int_elem_map.key"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "int_elem_map.key"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "int_elem_map.key"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "int_elem_map.value.name"
 indexinfo[].command[].command "lowercase"
@@ -58,6 +62,8 @@ indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "int_elem_map.value.weight"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "int_elem_map.value.weight"
+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 "type elem"
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 ecd9d36fd4e..e91784db387 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
@@ -20,6 +20,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mse4.value.sf2i"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse4.value"
 indexinfo[].command[].command "type elem"
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 40300a844f9..1304354a722 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
@@ -48,6 +48,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mse4.value.sf2i"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse4.value"
 indexinfo[].command[].command "type elem"
@@ -82,6 +84,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mse5.value.sf2i"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse5.value"
 indexinfo[].command[].command "type elem"
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 8d414cd85b9..2ef04a85a4f 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
@@ -44,6 +44,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mse4.value.sf2i"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse4.value"
 indexinfo[].command[].command "type elem"
@@ -78,6 +80,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mse5.value.sf2i"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse5.value"
 indexinfo[].command[].command "type elem"
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 0ea9cb3d225..cf6a2fc5992 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
@@ -50,6 +50,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mse4.value.sf2i"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mse4.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse4.value"
 indexinfo[].command[].command "type elem"
@@ -84,6 +86,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mse5.value.sf2i"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mse5.value.sf2i"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mse5.value"
 indexinfo[].command[].command "type elem"
diff --git a/config-model/src/test/derived/matchsettings_simple_def/index-info.cfg b/config-model/src/test/derived/matchsettings_simple_def/index-info.cfg
index e64fd9f3179..122742504ae 100644
--- a/config-model/src/test/derived/matchsettings_simple_def/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_simple_def/index-info.cfg
@@ -24,6 +24,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "field_2_struct"
 indexinfo[].command[].command "type elem"
diff --git a/config-model/src/test/derived/matchsettings_simple_wfs/index-info.cfg b/config-model/src/test/derived/matchsettings_simple_wfs/index-info.cfg
index 4b946b6d478..d02ba4d5afd 100644
--- a/config-model/src/test/derived/matchsettings_simple_wfs/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_simple_wfs/index-info.cfg
@@ -22,6 +22,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "field_2_struct"
 indexinfo[].command[].command "type elem"
diff --git a/config-model/src/test/derived/matchsettings_simple_wss/index-info.cfg b/config-model/src/test/derived/matchsettings_simple_wss/index-info.cfg
index 84120b262b2..2cad56de9fc 100644
--- a/config-model/src/test/derived/matchsettings_simple_wss/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_simple_wss/index-info.cfg
@@ -22,6 +22,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "field_2_struct"
 indexinfo[].command[].command "type elem"
diff --git a/config-model/src/test/derived/matchsettings_simple_wss_wfs/index-info.cfg b/config-model/src/test/derived/matchsettings_simple_wss_wfs/index-info.cfg
index 4b946b6d478..d02ba4d5afd 100644
--- a/config-model/src/test/derived/matchsettings_simple_wss_wfs/index-info.cfg
+++ b/config-model/src/test/derived/matchsettings_simple_wss_wfs/index-info.cfg
@@ -22,6 +22,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "field_2_struct.elem_field_2_int"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "field_2_struct"
 indexinfo[].command[].command "type elem"
diff --git a/config-model/src/test/derived/multiplesummaries/index-info.cfg b/config-model/src/test/derived/multiplesummaries/index-info.cfg
index 38561c591ce..65ffd71d1ca 100644
--- a/config-model/src/test/derived/multiplesummaries/index-info.cfg
+++ b/config-model/src/test/derived/multiplesummaries/index-info.cfg
@@ -58,6 +58,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "g"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "g"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "g"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "h"
 indexinfo[].command[].command "multivalue"
@@ -94,10 +96,14 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "loc_pos.x"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "loc_pos.x"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "loc_pos.x"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "loc_pos.y"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "loc_pos.y"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "loc_pos.y"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "loc_pos"
 indexinfo[].command[].command "default-position"
@@ -110,6 +116,8 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "loc_pos_zcurve"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "loc_pos_zcurve"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "loc_pos_zcurve"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "adynamic"
 indexinfo[].command[].command "dynteaser"
diff --git a/config-model/src/test/derived/music/index-info.cfg b/config-model/src/test/derived/music/index-info.cfg
index e2c632a3b5e..ab2177b9cef 100644
--- a/config-model/src/test/derived/music/index-info.cfg
+++ b/config-model/src/test/derived/music/index-info.cfg
@@ -12,12 +12,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "sales"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "sales"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "sales"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pto"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "pto"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pto"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pto"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "keys"
 indexinfo[].command[].command "lowercase"
@@ -36,6 +40,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mid"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mid"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mid"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "ew"
 indexinfo[].command[].command "lowercase"
@@ -56,6 +62,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "userrate"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "userrate"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "userrate"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pid"
 indexinfo[].command[].command "string"
@@ -110,6 +118,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "pfrom"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pfrom"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pfrom"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "bgnpfrom"
 indexinfo[].command[].command "attribute"
@@ -136,10 +146,14 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "numreview"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "numreview"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "numreview"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "bgnsellers"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "bgnsellers"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "bgnsellers"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "image"
 indexinfo[].command[].command "string"
@@ -178,6 +192,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "newestedition"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "newestedition"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "newestedition"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "bgnpto"
 indexinfo[].command[].command "string"
@@ -188,22 +204,30 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "year"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "year"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "year"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "did"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "did"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "did"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "did"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "scorekey"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "scorekey"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "scorekey"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "cbid"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "cbid"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "cbid"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "cbid"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "metalvalue"
 indexinfo[].command[].command "string"
diff --git a/config-model/src/test/derived/newrank/index-info.cfg b/config-model/src/test/derived/newrank/index-info.cfg
index f36679472fc..3ecd20fded9 100644
--- a/config-model/src/test/derived/newrank/index-info.cfg
+++ b/config-model/src/test/derived/newrank/index-info.cfg
@@ -12,12 +12,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "sales"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "sales"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "sales"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pto"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "pto"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pto"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pto"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "keys"
 indexinfo[].command[].command "lowercase"
@@ -36,6 +40,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "mid"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mid"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mid"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "ew"
 indexinfo[].command[].command "lowercase"
@@ -56,6 +62,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "userrate"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "userrate"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "userrate"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pid"
 indexinfo[].command[].command "string"
@@ -110,6 +118,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "pfrom"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pfrom"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pfrom"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "bgnpfrom"
 indexinfo[].command[].command "attribute"
@@ -136,10 +146,14 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "numreview"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "numreview"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "numreview"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "bgnsellers"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "bgnsellers"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "bgnsellers"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "image"
 indexinfo[].command[].command "string"
@@ -178,6 +192,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "newestedition"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "newestedition"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "newestedition"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "bgnpto"
 indexinfo[].command[].command "string"
@@ -188,24 +204,32 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "year"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "year"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "year"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "did"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "did"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "did"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "did"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "scorekey"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "scorekey"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "scorekey"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "scorekey"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "cbid"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "cbid"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "cbid"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "cbid"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "bgndata"
 indexinfo[].command[].command "dynteaser"
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 8a73f78f22d..5484964149e 100644
--- a/config-model/src/test/derived/position_array/index-info.cfg
+++ b/config-model/src/test/derived/position_array/index-info.cfg
@@ -6,10 +6,14 @@ indexinfo[].command[].command "word"
 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 "numerical"
 indexinfo[].command[].indexname "pos.y"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos.y"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pos"
 indexinfo[].command[].command "default-position"
@@ -26,4 +30,6 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pos_zcurve"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "type Array<long>"
diff --git a/config-model/src/test/derived/position_attribute/index-info.cfg b/config-model/src/test/derived/position_attribute/index-info.cfg
index 026a46d5a19..9db922e7ea2 100644
--- a/config-model/src/test/derived/position_attribute/index-info.cfg
+++ b/config-model/src/test/derived/position_attribute/index-info.cfg
@@ -6,10 +6,14 @@ indexinfo[].command[].command "word"
 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 "numerical"
 indexinfo[].command[].indexname "pos.y"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos.y"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pos"
 indexinfo[].command[].command "default-position"
@@ -22,4 +26,6 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pos_zcurve"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "type long"
diff --git a/config-model/src/test/derived/position_extra/index-info.cfg b/config-model/src/test/derived/position_extra/index-info.cfg
index 84a6fbc7396..9c229c2d336 100644
--- a/config-model/src/test/derived/position_extra/index-info.cfg
+++ b/config-model/src/test/derived/position_extra/index-info.cfg
@@ -10,10 +10,14 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "pos_ext.x"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pos_ext.x"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos_ext.x"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pos_ext.y"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pos_ext.y"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos_ext.y"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "pos_ext"
 indexinfo[].command[].command "default-position"
@@ -26,4 +30,6 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "pos_ext_zcurve"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "pos_ext_zcurve"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "pos_ext_zcurve"
 indexinfo[].command[].command "type long"
diff --git a/config-model/src/test/derived/structanyorder/index-info.cfg b/config-model/src/test/derived/structanyorder/index-info.cfg
index f941b044f39..6ea63818572 100644
--- a/config-model/src/test/derived/structanyorder/index-info.cfg
+++ b/config-model/src/test/derived/structanyorder/index-info.cfg
@@ -92,6 +92,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -100,6 +102,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -108,6 +112,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -116,6 +122,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -124,6 +132,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -132,6 +142,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -140,6 +152,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -148,6 +162,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -156,6 +172,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structfield.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structfield.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structfield.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structfield.s4"
 indexinfo[].command[].command "type foo"
@@ -250,6 +268,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -258,6 +278,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -266,6 +288,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -274,6 +298,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -282,6 +308,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -290,6 +318,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -298,6 +328,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s3.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -306,6 +338,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s3.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s3.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s3.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s3.s4"
 indexinfo[].command[].command "type foo"
@@ -314,6 +348,8 @@ indexinfo[].command[].command "type sct"
 indexinfo[].command[].indexname "structarrayfield.s4.s1"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "structarrayfield.s4.s1"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "structarrayfield.s4.s1"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "structarrayfield.s4"
 indexinfo[].command[].command "type foo"
diff --git a/config-model/src/test/derived/types/index-info.cfg b/config-model/src/test/derived/types/index-info.cfg
index f8e39d540ec..cc49e006f98 100644
--- a/config-model/src/test/derived/types/index-info.cfg
+++ b/config-model/src/test/derived/types/index-info.cfg
@@ -8,12 +8,16 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "abyte"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "abyte"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "abyte"
 indexinfo[].command[].command "type byte"
 indexinfo[].command[].indexname "along"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "along"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "along"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "along"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "abool"
 indexinfo[].command[].command "attribute"
@@ -34,6 +38,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "arrayfield"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "arrayfield"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "arrayfield"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "setfield"
 indexinfo[].command[].command "lowercase"
@@ -140,6 +146,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "intmapfield.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "intmapfield.value"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "intmapfield.value"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "intmapfield"
 indexinfo[].command[].command "multivalue"
@@ -160,10 +168,14 @@ indexinfo[].command[].command "type Map<string,float>"
 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 "numerical"
 indexinfo[].command[].indexname "longmapfield.value"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "longmapfield.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "longmapfield"
 indexinfo[].command[].command "multivalue"
@@ -172,6 +184,8 @@ indexinfo[].command[].command "type Map<int,long>"
 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 "numerical"
@@ -190,6 +204,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "arraymapfield.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "arraymapfield.value"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "arraymapfield.value"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "arraymapfield"
 indexinfo[].command[].command "multivalue"
@@ -212,6 +228,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "mystructfield.bytearr"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mystructfield.bytearr"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mystructfield.bytearr"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "mystructfield.mymap.key"
 indexinfo[].command[].command "string"
@@ -238,12 +256,16 @@ indexinfo[].command[].command "type mystruct"
 indexinfo[].command[].indexname "mystructmap.key"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mystructmap.key"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mystructmap.key"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "mystructmap.value.bytearr"
 indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "mystructmap.value.bytearr"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mystructmap.value.bytearr"
+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 "string"
@@ -276,6 +298,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "mystructarr.bytearr"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "mystructarr.bytearr"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "mystructarr.bytearr"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "mystructarr.mymap.key"
 indexinfo[].command[].command "string"
@@ -304,10 +328,14 @@ indexinfo[].command[].command "type Array<mystruct>"
 indexinfo[].command[].indexname "Folders.key"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.key"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.key"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.Name"
 indexinfo[].command[].command "string"
@@ -320,6 +348,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.FlagsCounter.value"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -328,6 +358,8 @@ indexinfo[].command[].command "type Map<string,long>"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.Name"
 indexinfo[].command[].command "string"
@@ -340,6 +372,8 @@ indexinfo[].command[].command "type string"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.value"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -348,6 +382,8 @@ indexinfo[].command[].command "type Map<string,long>"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "string"
@@ -360,6 +396,8 @@ indexinfo[].command[].command "type string"
 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"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -368,6 +406,8 @@ indexinfo[].command[].command "type Map<string,long>"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "string"
@@ -380,6 +420,8 @@ indexinfo[].command[].command "type string"
 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"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -388,6 +430,8 @@ indexinfo[].command[].command "type Map<string,long>"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "string"
@@ -400,6 +444,8 @@ indexinfo[].command[].command "type string"
 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"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -408,6 +454,8 @@ indexinfo[].command[].command "type Map<string,long>"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "string"
@@ -420,6 +468,8 @@ indexinfo[].command[].command "type string"
 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"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -428,6 +478,8 @@ indexinfo[].command[].command "type Map<string,long>"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "string"
@@ -440,6 +492,8 @@ indexinfo[].command[].command "type string"
 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"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -448,6 +502,8 @@ indexinfo[].command[].command "type Map<string,long>"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "string"
@@ -460,6 +516,8 @@ indexinfo[].command[].command "type string"
 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"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -468,6 +526,8 @@ indexinfo[].command[].command "type Map<string,long>"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Version"
 indexinfo[].command[].command "type int"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.Name"
 indexinfo[].command[].command "string"
@@ -480,6 +540,8 @@ indexinfo[].command[].command "type string"
 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"
+indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter.value"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "Folders.value.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.anotherfolder.FlagsCounter"
 indexinfo[].command[].command "multivalue"
@@ -516,6 +578,8 @@ indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "juletre"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "juletre"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "juletre"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "album0"
 indexinfo[].command[].command "multivalue"
@@ -536,6 +600,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "other"
 indexinfo[].command[].command "numerical"
 indexinfo[].command[].indexname "other"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "other"
 indexinfo[].command[].command "type long"
 indexinfo[].command[].indexname "pst_sta_boldingoff_nomatch_tag_01"
 indexinfo[].command[].command "multivalue"