- Add match config for default match type during query.

- Add restart annotations on config that alwasy require restart.
- Change default from legacy CASE_INSENSITIVE to UNCASED.

23 files changed, 276 insertions, 154 deletions

diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg
index bc95cf86071..63bd7d980a6 100644
--- a/config-model/src/test/derived/advanced/attributes.cfg
+++ b/config-model/src/test/derived/advanced/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "location_zcurve"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
index 18bf8f12b32..eff0f7bd7a1 100644
--- a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "elem_array.name"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -31,7 +32,8 @@ attribute[].name "elem_array.weight"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg
index acdd50db696..43f8b813139 100644
--- a/config-model/src/test/derived/attributeprefetch/attributes.cfg
+++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "singlebyte"
 attribute[].datatype INT8
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "multibyte"
 attribute[].datatype INT8
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "wsbyte"
 attribute[].datatype INT8
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "singleint"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "multiint"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -147,7 +152,8 @@ attribute[].name "wsint"
 attribute[].datatype INT32
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -176,7 +182,8 @@ attribute[].name "singlelong"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -205,7 +212,8 @@ attribute[].name "multilong"
 attribute[].datatype INT64
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -234,7 +242,8 @@ attribute[].name "wslong"
 attribute[].datatype INT64
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -263,7 +272,8 @@ attribute[].name "singlefloat"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -292,7 +302,8 @@ attribute[].name "multifloat"
 attribute[].datatype FLOAT
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -321,7 +332,8 @@ attribute[].name "wsfloat"
 attribute[].datatype FLOAT
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -350,7 +362,8 @@ attribute[].name "singledouble"
 attribute[].datatype DOUBLE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -379,7 +392,8 @@ attribute[].name "multidouble"
 attribute[].datatype DOUBLE
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -408,7 +422,8 @@ attribute[].name "wsdouble"
 attribute[].datatype DOUBLE
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -437,7 +452,8 @@ attribute[].name "singlestring"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -466,7 +482,8 @@ attribute[].name "multistring"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -495,7 +512,8 @@ attribute[].name "wsstring"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg
index c5a6ff372ad..82d1f7c99dc 100644
--- a/config-model/src/test/derived/attributes/attributes.cfg
+++ b/config-model/src/test/derived/attributes/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "a1"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "a2"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "a3"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "a5"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "a6"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -147,7 +152,8 @@ attribute[].name "b1"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -176,7 +182,8 @@ attribute[].name "b2"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -205,7 +212,8 @@ attribute[].name "b3"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -234,7 +242,8 @@ attribute[].name "b4"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -263,7 +272,8 @@ attribute[].name "b5"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -292,7 +302,8 @@ attribute[].name "b6"
 attribute[].datatype INT64
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -321,7 +332,8 @@ attribute[].name "b7"
 attribute[].datatype DOUBLE
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -350,7 +362,8 @@ attribute[].name "a9"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -379,7 +392,8 @@ attribute[].name "a10"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -408,7 +422,8 @@ attribute[].name "a11"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -437,7 +452,8 @@ attribute[].name "a12"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -466,7 +482,8 @@ attribute[].name "a7_arr"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -495,7 +512,8 @@ attribute[].name "a8_arr"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg
index 6ca16458334..3c0f10722de 100644
--- a/config-model/src/test/derived/complex/attributes.cfg
+++ b/config-model/src/test/derived/complex/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "prefixenabled"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "fleeting"
 attribute[].datatype FLOAT
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "fleeting2"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "foundat"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "collapseby"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -147,7 +152,8 @@ attribute[].name "ts"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -176,7 +182,8 @@ attribute[].name "combineda"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -205,7 +212,8 @@ attribute[].name "year_arr"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -234,7 +242,8 @@ attribute[].name "year_sub"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg
index ec8eaab7dd4..f7f040bf182 100644
--- a/config-model/src/test/derived/hnsw_index/attributes.cfg
+++ b/config-model/src/test/derived/hnsw_index/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "t1"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "t2"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
index 340ff11d0b2..26019842732 100644
--- a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
+++ b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "ref_from_a"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "ref_from_b"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "from_a_int_field"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "from_b_int_field"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/imported_position_field/attributes.cfg b/config-model/src/test/derived/imported_position_field/attributes.cfg
index f8d3a37c00b..70b6ed14c55 100644
--- a/config-model/src/test/derived/imported_position_field/attributes.cfg
+++ b/config-model/src/test/derived/imported_position_field/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "parent_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "my_pos_zcurve"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/imported_struct_fields/attributes.cfg b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
index cfeff008f0d..e06d0f1a220 100644
--- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "parent_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "my_elem_array.name"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -60,7 +62,8 @@ attribute[].name "my_elem_array.weight"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "my_elem_map.key"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -118,7 +122,8 @@ attribute[].name "my_elem_map.value.name"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -147,7 +152,8 @@ attribute[].name "my_elem_map.value.weight"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -176,7 +182,8 @@ attribute[].name "my_str_int_map.key"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -205,7 +212,8 @@ attribute[].name "my_str_int_map.value"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg
index e86581ecae5..57dd2408869 100644
--- a/config-model/src/test/derived/importedfields/attributes.cfg
+++ b/config-model/src/test/derived/importedfields/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "a_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "b_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "b_ref_with_summary"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "my_int_field"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "my_string_field"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -147,7 +152,8 @@ attribute[].name "my_int_array_field"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -176,7 +182,8 @@ attribute[].name "my_int_wset_field"
 attribute[].datatype INT32
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -205,7 +212,8 @@ attribute[].name "my_ancient_int_field"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg
index f20462ef647..9f5588b0000 100644
--- a/config-model/src/test/derived/inheritance/attributes.cfg
+++ b/config-model/src/test/derived/inheritance/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "onlygrandparent"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "overridden"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "onlymother"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg
index c6cda880b84..0a1cf0b9f0e 100644
--- a/config-model/src/test/derived/inheritfromparent/attributes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "weight"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg
index 2416cd3b128..ebcca4fde78 100644
--- a/config-model/src/test/derived/map_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_attribute/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "str_map.key"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -31,7 +32,8 @@ attribute[].name "str_map.value"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "int_map.key"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
index 45f1b6c036e..bc7a17ebd62 100644
--- a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "str_elem_map.key"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -31,7 +32,8 @@ attribute[].name "str_elem_map.value.name"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "str_elem_map.value.weight"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "int_elem_map.key"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "int_elem_map.value.name"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg
index fbfd3b15281..bbe95047caa 100644
--- a/config-model/src/test/derived/music/attributes.cfg
+++ b/config-model/src/test/derived/music/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "sales"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "pto"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "mid"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "weight"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "bgnpfrom"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -147,7 +152,8 @@ attribute[].name "newestedition"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -176,7 +182,8 @@ attribute[].name "year"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -205,7 +212,8 @@ attribute[].name "did"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -234,7 +242,8 @@ attribute[].name "cbid"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -263,7 +272,8 @@ attribute[].name "hiphopvalue_arr"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -292,7 +302,8 @@ attribute[].name "metalvalue_arr"
 attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg
index 84c7f6cd099..a690b075f22 100644
--- a/config-model/src/test/derived/newrank/attributes.cfg
+++ b/config-model/src/test/derived/newrank/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "sales"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "pto"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "mid"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "weight"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "bgnpfrom"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -147,7 +152,8 @@ attribute[].name "newestedition"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -176,7 +182,8 @@ attribute[].name "year"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -205,7 +212,8 @@ attribute[].name "did"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -234,7 +242,8 @@ attribute[].name "scorekey"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -263,7 +272,8 @@ attribute[].name "cbid"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg
index f0e600b8875..1d6e0c9de32 100644
--- a/config-model/src/test/derived/predicate_attribute/attributes.cfg
+++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "some_predicate_field"
 attribute[].datatype PREDICATE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
index 4b39c7caa2c..bb6f61a6f04 100644
--- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "attributefield1"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "attributefield2"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg
index 9f5b80dbe4c..cc10e657011 100644
--- a/config-model/src/test/derived/reference_fields/attributes.cfg
+++ b/config-model/src/test/derived/reference_fields/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "campaign_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "other_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "yet_another_ref"
 attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg
index 69c3510df97..5ee9d323041 100644
--- a/config-model/src/test/derived/sorting/attributes.cfg
+++ b/config-model/src/test/derived/sorting/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "syntaxcheck"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "syntaxcheck2"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "infieldonly"
 attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg
index 29eff247aed..79f4d2a8a69 100644
--- a/config-model/src/test/derived/tensor/attributes.cfg
+++ b/config-model/src/test/derived/tensor/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "f2"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "f3"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "f4"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "f5"
 attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "f6"
 attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg
index 082752caa43..175dd083f60 100644
--- a/config-model/src/test/derived/types/attributes.cfg
+++ b/config-model/src/test/derived/types/attributes.cfg
@@ -2,7 +2,8 @@ attribute[].name "abyte"
 attribute[].datatype INT8
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -31,7 +32,8 @@ attribute[].name "along"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -60,7 +62,8 @@ attribute[].name "abool"
 attribute[].datatype BOOL
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -89,7 +92,8 @@ attribute[].name "ashortfloat"
 attribute[].datatype FLOAT16
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -118,7 +122,8 @@ attribute[].name "arrayfield"
 attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -147,7 +152,8 @@ attribute[].name "setfield"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -176,7 +182,8 @@ attribute[].name "setfield2"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -205,7 +212,8 @@ attribute[].name "setfield3"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero true
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -234,7 +242,8 @@ attribute[].name "setfield4"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -263,7 +272,8 @@ attribute[].name "tagfield"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -292,7 +302,8 @@ attribute[].name "juletre"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -321,7 +332,8 @@ attribute[].name "album1"
 attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -350,7 +362,8 @@ attribute[].name "other"
 attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.type BTREE
-attribute[].dictionary.match CASE_INSENSITIVE
+attribute[].dictionary.match UNCASED
+attribute[].match UNCASED
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java
index a94ba54b750..f07f214c9db 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java
@@ -54,9 +54,9 @@ public class DictionaryTestCase {
                 getConfig(search).attribute().get(0).dictionary().type());
         assertEquals(AttributesConfig.Attribute.Dictionary.Type.BTREE,
                 getConfig(search).attribute().get(1).dictionary().type());
-        assertEquals(AttributesConfig.Attribute.Dictionary.Match.CASE_INSENSITIVE,
+        assertEquals(AttributesConfig.Attribute.Dictionary.Match.UNCASED,
                 getConfig(search).attribute().get(0).dictionary().match());
-        assertEquals(AttributesConfig.Attribute.Dictionary.Match.CASE_INSENSITIVE,
+        assertEquals(AttributesConfig.Attribute.Dictionary.Match.UNCASED,
                 getConfig(search).attribute().get(1).dictionary().match());
     }
 
@@ -130,19 +130,16 @@ public class DictionaryTestCase {
     }
     @Test
     public void testStringBtreeSettings() throws ParseException {
-        verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.UNCASED, Case.UNCASED,
-                "dictionary:btree");
+        verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.UNCASED, Case.UNCASED, "dictionary:btree");
     }
     @Test
     public void testStringBtreeUnCasedSettings() throws ParseException {
-        verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.UNCASED, Case.UNCASED,
-                "dictionary { btree\nuncased\n}");
+        verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.UNCASED, Case.UNCASED, "dictionary { btree\nuncased\n}");
     }
     @Test
     public void testStringBtreeCasedSettings() throws ParseException {
         try {
-            verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.CASED, Case.CASED,
-                    "dictionary { btree\ncased\n}");
+            verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.CASED, Case.CASED, "dictionary { btree\ncased\n}");
         } catch (IllegalArgumentException e) {
             assertEquals("For search 'test', field 'n1': btree dictionary require uncased match", e.getMessage());
         }
@@ -150,8 +147,7 @@ public class DictionaryTestCase {
     @Test
     public void testStringHashSettings() throws ParseException {
         try {
-        verifyStringDictionaryControl(Dictionary.Type.HASH, Case.UNCASED, Case.UNCASED,
-                "dictionary:hash");
+            verifyStringDictionaryControl(Dictionary.Type.HASH, Case.UNCASED, Case.UNCASED, "dictionary:hash");
         } catch (IllegalArgumentException e) {
             assertEquals("For search 'test', field 'n1': hash dictionary require cased match", e.getMessage());
         }
@@ -159,22 +155,19 @@ public class DictionaryTestCase {
     @Test
     public void testStringHashUnCasedSettings() throws ParseException {
         try {
-            verifyStringDictionaryControl(Dictionary.Type.HASH, Case.UNCASED, Case.UNCASED,
-                    "dictionary { hash\nuncased\n}");
+            verifyStringDictionaryControl(Dictionary.Type.HASH, Case.UNCASED, Case.UNCASED, "dictionary { hash\nuncased\n}");
         } catch (IllegalArgumentException e) {
             assertEquals("For search 'test', field 'n1': hash dictionary require cased match", e.getMessage());
         }
     }
     @Test
     public void testStringHashBothCasedSettings() throws ParseException {
-        verifyStringDictionaryControl(Dictionary.Type.HASH, Case.CASED, Case.CASED,
-                "dictionary { hash\ncased\n}", "match:cased");
+        verifyStringDictionaryControl(Dictionary.Type.HASH, Case.CASED, Case.CASED, "dictionary { hash\ncased\n}", "match:cased");
     }
     @Test
     public void testStringHashCasedSettings() throws ParseException {
         try {
-            verifyStringDictionaryControl(Dictionary.Type.HASH, Case.CASED, Case.CASED,
-                    "dictionary { hash\ncased\n}");
+            verifyStringDictionaryControl(Dictionary.Type.HASH, Case.CASED, Case.CASED, "dictionary { hash\ncased\n}");
             fail();
         } catch (IllegalArgumentException e) {
             assertEquals("For search 'test', field 'n1': Dictionary casing 'CASED' does not match field match casing 'UNCASED'", e.getMessage());
@@ -182,19 +175,16 @@ public class DictionaryTestCase {
     }
     @Test
     public void testStringBtreeHashSettings() throws ParseException {
-        verifyStringDictionaryControl(Dictionary.Type.BTREE_AND_HASH, Case.UNCASED, Case.UNCASED,
-                "dictionary{hash\nbtree\n}");
+        verifyStringDictionaryControl(Dictionary.Type.BTREE_AND_HASH, Case.UNCASED, Case.UNCASED, "dictionary{hash\nbtree\n}");
     }
     @Test
     public void testStringBtreeHashUnCasedSettings() throws ParseException {
-        verifyStringDictionaryControl(Dictionary.Type.BTREE_AND_HASH, Case.UNCASED, Case.UNCASED,
-                "dictionary { hash\nbtree\nuncased\n}");
+        verifyStringDictionaryControl(Dictionary.Type.BTREE_AND_HASH, Case.UNCASED, Case.UNCASED, "dictionary { hash\nbtree\nuncased\n}");
     }
     @Test
     public void testStringBtreeHashCasedSettings() throws ParseException {
         try {
-            verifyStringDictionaryControl(Dictionary.Type.BTREE_AND_HASH, Case.CASED, Case.CASED,
-                    "dictionary { btree\nhash\ncased\n}");
+            verifyStringDictionaryControl(Dictionary.Type.BTREE_AND_HASH, Case.CASED, Case.CASED, "dictionary { btree\nhash\ncased\n}");
         } catch (IllegalArgumentException e) {
             assertEquals("For search 'test', field 'n1': btree dictionary require uncased match", e.getMessage());
         }