diff --git a/src/Core/Field.h b/src/Core/Field.h
index 05cf0b1abfd..744675d6e86 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -252,9 +252,6 @@ public:
         /// Type tag.
         enum Which
         {
-            NegativeInfinity = -1,
-            PositiveInfinity = -2,
-
             Null    = 0,
             UInt64  = 1,
             Int64   = 2,
@@ -274,6 +271,10 @@ public:
             Int256  = 25,
             Map = 26,
             UUID = 27,
+
+            // Special types for index analysis
+            NegativeInfinity = 254,
+            PositiveInfinity = 255,
         };
 
         static const char * toString(Which which)
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.reference b/tests/queries/0_stateless/01786_explain_merge_tree.reference
index 7a0a0af3e05..9b2df9773ea 100644
--- a/tests/queries/0_stateless/01786_explain_merge_tree.reference
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.reference
@@ -3,21 +3,21 @@
         MinMax
           Keys: 
             y
-          Condition: (y in [1, +inf))
+          Condition: (y in [1, +Inf))
           Parts: 4/5
           Granules: 11/12
         Partition
           Keys: 
             y
             bitAnd(z, 3)
-          Condition: and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +inf)), (bitAnd(z, 3) not in [1, 1])))
+          Condition: and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +Inf)), (bitAnd(z, 3) not in [1, 1])))
           Parts: 3/4
           Granules: 10/11
         PrimaryKey
           Keys: 
             x
             y
-          Condition: and((x in [11, +inf)), (y in [1, +inf)))
+          Condition: and((x in [11, +Inf)), (y in [1, +Inf)))
           Parts: 2/3
           Granules: 6/10
         Skip
@@ -36,7 +36,7 @@
                     {
                       "Type": "MinMax",
                       "Keys": ["y"],
-                      "Condition": "(y in [1, +inf))",
+                      "Condition": "(y in [1, +Inf))",
                       "Initial Parts": 5,
                       "Selected Parts": 4,
                       "Initial Granules": 12,
@@ -45,7 +45,7 @@
                     {
                       "Type": "Partition",
                       "Keys": ["y", "bitAnd(z, 3)"],
-                      "Condition": "and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +inf)), (bitAnd(z, 3) not in [1, 1])))",
+                      "Condition": "and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +Inf)), (bitAnd(z, 3) not in [1, 1])))",
                       "Initial Parts": 4,
                       "Selected Parts": 3,
                       "Initial Granules": 11,
@@ -54,7 +54,7 @@
                     {
                       "Type": "PrimaryKey",
                       "Keys": ["x", "y"],
-                      "Condition": "and((x in [11, +inf)), (y in [1, +inf)))",
+                      "Condition": "and((x in [11, +Inf)), (y in [1, +Inf)))",
                       "Initial Parts": 3,
                       "Selected Parts": 2,
                       "Initial Granules": 10,
@@ -104,6 +104,6 @@
           Keys: 
             x
             plus(x, y)
-          Condition: or((x in 2-element set), (plus(plus(x, y), 1) in (-inf, 2]))
+          Condition: or((x in 2-element set), (plus(plus(x, y), 1) in (-Inf, 2]))
           Parts: 1/1
           Granules: 1/1