diff --git a/promql/parser/generated_parser.y b/promql/parser/generated_parser.y
index befb9bdf3..c321a1e97 100644
--- a/promql/parser/generated_parser.y
+++ b/promql/parser/generated_parser.y
@@ -667,10 +667,16 @@ label_set_list  : label_set_list COMMA label_set_item
 
 label_set_item  : IDENTIFIER EQL STRING
                         { $$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
+                | string_identifier EQL STRING
+                        { $$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
                 | IDENTIFIER EQL error
                         { yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}}
+                | string_identifier EQL error
+                        { yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}}
                 | IDENTIFIER error
                         { yylex.(*parser).unexpected("label set", "\"=\""); $$ = labels.Label{}}
+                | string_identifier error
+                        { yylex.(*parser).unexpected("label set", "\"=\""); $$ = labels.Label{}}
                 | error
                         { yylex.(*parser).unexpected("label set", "identifier or \"}\""); $$ = labels.Label{} }
                 ;
diff --git a/promql/parser/generated_parser.y.go b/promql/parser/generated_parser.y.go
index ad58a5297..8979410ce 100644
--- a/promql/parser/generated_parser.y.go
+++ b/promql/parser/generated_parser.y.go
@@ -251,293 +251,295 @@ var yyExca = [...]int16{
 	1, -1,
 	-2, 0,
 	-1, 37,
-	1, 138,
-	10, 138,
-	24, 138,
+	1, 141,
+	10, 141,
+	24, 141,
 	-2, 0,
 	-1, 61,
-	2, 181,
-	15, 181,
-	79, 181,
-	85, 181,
-	-2, 102,
-	-1, 62,
-	2, 182,
-	15, 182,
-	79, 182,
-	85, 182,
-	-2, 103,
-	-1, 63,
-	2, 183,
-	15, 183,
-	79, 183,
-	85, 183,
-	-2, 105,
-	-1, 64,
 	2, 184,
 	15, 184,
 	79, 184,
 	85, 184,
-	-2, 106,
-	-1, 65,
+	-2, 102,
+	-1, 62,
 	2, 185,
 	15, 185,
 	79, 185,
 	85, 185,
-	-2, 107,
-	-1, 66,
+	-2, 103,
+	-1, 63,
 	2, 186,
 	15, 186,
 	79, 186,
 	85, 186,
-	-2, 112,
-	-1, 67,
+	-2, 105,
+	-1, 64,
 	2, 187,
 	15, 187,
 	79, 187,
 	85, 187,
-	-2, 114,
-	-1, 68,
+	-2, 106,
+	-1, 65,
 	2, 188,
 	15, 188,
 	79, 188,
 	85, 188,
-	-2, 116,
-	-1, 69,
+	-2, 107,
+	-1, 66,
 	2, 189,
 	15, 189,
 	79, 189,
 	85, 189,
-	-2, 117,
-	-1, 70,
+	-2, 112,
+	-1, 67,
 	2, 190,
 	15, 190,
 	79, 190,
 	85, 190,
-	-2, 118,
-	-1, 71,
+	-2, 114,
+	-1, 68,
 	2, 191,
 	15, 191,
 	79, 191,
 	85, 191,
-	-2, 119,
-	-1, 72,
+	-2, 116,
+	-1, 69,
 	2, 192,
 	15, 192,
 	79, 192,
 	85, 192,
-	-2, 120,
-	-1, 73,
+	-2, 117,
+	-1, 70,
 	2, 193,
 	15, 193,
 	79, 193,
 	85, 193,
-	-2, 124,
-	-1, 74,
+	-2, 118,
+	-1, 71,
 	2, 194,
 	15, 194,
 	79, 194,
 	85, 194,
+	-2, 119,
+	-1, 72,
+	2, 195,
+	15, 195,
+	79, 195,
+	85, 195,
+	-2, 120,
+	-1, 73,
+	2, 196,
+	15, 196,
+	79, 196,
+	85, 196,
+	-2, 124,
+	-1, 74,
+	2, 197,
+	15, 197,
+	79, 197,
+	85, 197,
 	-2, 125,
-	-1, 200,
-	9, 243,
-	12, 243,
-	13, 243,
-	18, 243,
-	19, 243,
-	25, 243,
-	41, 243,
-	47, 243,
-	48, 243,
-	51, 243,
-	57, 243,
-	62, 243,
-	63, 243,
-	64, 243,
-	65, 243,
-	66, 243,
-	67, 243,
-	68, 243,
-	69, 243,
-	70, 243,
-	71, 243,
-	72, 243,
-	73, 243,
-	74, 243,
-	75, 243,
-	79, 243,
-	83, 243,
-	85, 243,
-	88, 243,
-	89, 243,
+	-1, 205,
+	9, 246,
+	12, 246,
+	13, 246,
+	18, 246,
+	19, 246,
+	25, 246,
+	41, 246,
+	47, 246,
+	48, 246,
+	51, 246,
+	57, 246,
+	62, 246,
+	63, 246,
+	64, 246,
+	65, 246,
+	66, 246,
+	67, 246,
+	68, 246,
+	69, 246,
+	70, 246,
+	71, 246,
+	72, 246,
+	73, 246,
+	74, 246,
+	75, 246,
+	79, 246,
+	83, 246,
+	85, 246,
+	88, 246,
+	89, 246,
 	-2, 0,
-	-1, 201,
-	9, 243,
-	12, 243,
-	13, 243,
-	18, 243,
-	19, 243,
-	25, 243,
-	41, 243,
-	47, 243,
-	48, 243,
-	51, 243,
-	57, 243,
-	62, 243,
-	63, 243,
-	64, 243,
-	65, 243,
-	66, 243,
-	67, 243,
-	68, 243,
-	69, 243,
-	70, 243,
-	71, 243,
-	72, 243,
-	73, 243,
-	74, 243,
-	75, 243,
-	79, 243,
-	83, 243,
-	85, 243,
-	88, 243,
-	89, 243,
+	-1, 206,
+	9, 246,
+	12, 246,
+	13, 246,
+	18, 246,
+	19, 246,
+	25, 246,
+	41, 246,
+	47, 246,
+	48, 246,
+	51, 246,
+	57, 246,
+	62, 246,
+	63, 246,
+	64, 246,
+	65, 246,
+	66, 246,
+	67, 246,
+	68, 246,
+	69, 246,
+	70, 246,
+	71, 246,
+	72, 246,
+	73, 246,
+	74, 246,
+	75, 246,
+	79, 246,
+	83, 246,
+	85, 246,
+	88, 246,
+	89, 246,
 	-2, 0,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 799
+const yyLast = 804
 
 var yyAct = [...]int16{
-	152, 334, 332, 155, 339, 226, 39, 192, 276, 44,
-	291, 290, 118, 82, 178, 229, 107, 106, 346, 347,
-	348, 349, 109, 108, 198, 239, 199, 156, 110, 105,
-	6, 245, 200, 201, 133, 325, 111, 329, 228, 60,
-	357, 293, 328, 304, 267, 160, 266, 128, 55, 151,
-	302, 311, 302, 196, 340, 159, 55, 89, 54, 356,
-	241, 242, 355, 113, 243, 114, 54, 98, 99, 265,
-	112, 101, 256, 104, 88, 230, 232, 234, 235, 236,
-	244, 246, 249, 250, 251, 252, 253, 257, 258, 105,
-	333, 231, 233, 237, 238, 240, 247, 248, 103, 115,
-	109, 254, 255, 324, 150, 218, 110, 264, 111, 270,
-	77, 35, 7, 149, 188, 163, 322, 321, 173, 320,
-	167, 170, 323, 165, 271, 166, 2, 3, 4, 5,
-	263, 101, 194, 104, 180, 184, 197, 187, 186, 319,
-	272, 202, 203, 204, 205, 206, 207, 208, 209, 210,
-	211, 212, 213, 214, 215, 216, 195, 299, 103, 318,
-	217, 36, 298, 1, 190, 219, 220, 317, 160, 160,
-	316, 193, 160, 154, 182, 196, 229, 297, 159, 159,
-	160, 358, 159, 268, 181, 183, 239, 260, 296, 262,
-	159, 315, 245, 129, 314, 55, 225, 313, 161, 228,
-	161, 161, 259, 312, 161, 54, 86, 295, 310, 288,
-	289, 8, 161, 292, 162, 37, 162, 162, 49, 269,
-	162, 241, 242, 309, 179, 243, 180, 127, 162, 126,
-	308, 223, 294, 256, 48, 222, 230, 232, 234, 235,
-	236, 244, 246, 249, 250, 251, 252, 253, 257, 258,
-	221, 169, 231, 233, 237, 238, 240, 247, 248, 157,
-	158, 164, 254, 255, 168, 10, 182, 300, 55, 301,
-	303, 47, 305, 46, 132, 79, 181, 183, 54, 306,
-	307, 45, 134, 135, 136, 137, 138, 139, 140, 141,
-	142, 143, 144, 145, 146, 147, 148, 43, 59, 50,
-	84, 9, 9, 121, 326, 78, 327, 130, 171, 121,
-	83, 42, 131, 119, 335, 336, 337, 331, 185, 119,
-	338, 261, 342, 341, 344, 343, 122, 117, 41, 177,
-	350, 351, 122, 55, 176, 352, 53, 77, 40, 56,
-	125, 354, 22, 54, 84, 124, 172, 175, 51, 57,
-	191, 353, 273, 85, 83, 189, 359, 224, 123, 80,
-	345, 120, 81, 153, 58, 75, 227, 52, 116, 0,
-	0, 18, 19, 0, 0, 20, 0, 0, 0, 0,
-	0, 76, 0, 0, 0, 0, 61, 62, 63, 64,
-	65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
-	0, 0, 0, 13, 0, 0, 0, 24, 0, 30,
-	0, 0, 31, 32, 55, 38, 105, 53, 77, 0,
-	56, 275, 0, 22, 54, 0, 0, 0, 274, 0,
-	57, 0, 278, 279, 277, 284, 286, 283, 285, 280,
-	281, 282, 287, 87, 89, 0, 75, 0, 0, 0,
-	0, 0, 18, 19, 98, 99, 20, 0, 101, 102,
-	104, 88, 76, 0, 0, 0, 0, 61, 62, 63,
-	64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
-	74, 0, 0, 0, 13, 103, 0, 0, 24, 0,
-	30, 0, 55, 31, 32, 53, 77, 0, 56, 330,
-	0, 22, 54, 0, 0, 0, 0, 0, 57, 0,
-	278, 279, 277, 284, 286, 283, 285, 280, 281, 282,
-	287, 0, 0, 0, 75, 0, 0, 0, 0, 0,
-	18, 19, 0, 0, 20, 0, 0, 0, 17, 77,
-	76, 0, 0, 0, 22, 61, 62, 63, 64, 65,
-	66, 67, 68, 69, 70, 71, 72, 73, 74, 0,
-	0, 0, 13, 0, 0, 0, 24, 0, 30, 0,
-	0, 31, 32, 18, 19, 0, 0, 20, 0, 0,
-	0, 17, 35, 0, 0, 0, 0, 22, 11, 12,
-	14, 15, 16, 21, 23, 25, 26, 27, 28, 29,
-	33, 34, 0, 0, 0, 13, 0, 0, 0, 24,
-	0, 30, 0, 0, 31, 32, 18, 19, 0, 0,
-	20, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 11, 12, 14, 15, 16, 21, 23, 25, 26,
-	27, 28, 29, 33, 34, 105, 0, 0, 13, 0,
-	0, 0, 24, 174, 30, 0, 0, 31, 32, 0,
-	0, 0, 0, 0, 105, 0, 0, 0, 0, 0,
-	0, 0, 87, 89, 90, 0, 91, 92, 93, 94,
-	95, 96, 97, 98, 99, 100, 0, 101, 102, 104,
-	88, 87, 89, 90, 0, 91, 92, 93, 94, 95,
-	96, 97, 98, 99, 100, 0, 101, 102, 104, 88,
-	105, 0, 0, 0, 103, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 105,
-	0, 0, 0, 103, 0, 0, 0, 87, 89, 90,
-	0, 91, 92, 93, 0, 95, 96, 97, 98, 99,
-	100, 0, 101, 102, 104, 88, 87, 89, 90, 0,
-	91, 92, 0, 0, 95, 96, 0, 98, 99, 100,
-	0, 101, 102, 104, 88, 0, 0, 0, 0, 103,
+	155, 339, 337, 158, 344, 231, 39, 197, 281, 44,
+	296, 295, 84, 120, 82, 181, 109, 108, 351, 352,
+	353, 354, 107, 111, 203, 136, 204, 159, 154, 112,
+	205, 206, 234, 6, 271, 55, 163, 163, 107, 334,
+	333, 307, 244, 275, 309, 54, 162, 162, 250, 363,
+	91, 272, 330, 131, 362, 233, 60, 270, 276, 110,
+	100, 101, 298, 115, 103, 116, 106, 90, 164, 164,
+	114, 265, 113, 361, 277, 307, 360, 246, 247, 338,
+	103, 248, 106, 153, 165, 165, 264, 316, 201, 261,
+	122, 105, 235, 237, 239, 240, 241, 249, 251, 254,
+	255, 256, 257, 258, 262, 263, 273, 105, 236, 238,
+	242, 243, 245, 252, 253, 152, 117, 166, 259, 260,
+	176, 164, 170, 173, 163, 168, 223, 169, 172, 2,
+	3, 4, 5, 107, 162, 199, 111, 165, 187, 202,
+	189, 171, 112, 269, 207, 208, 209, 210, 211, 212,
+	213, 214, 215, 216, 217, 218, 219, 220, 221, 200,
+	89, 91, 113, 222, 123, 193, 268, 329, 224, 225,
+	183, 100, 101, 191, 121, 103, 104, 106, 90, 7,
+	85, 234, 266, 182, 55, 183, 328, 86, 192, 123,
+	83, 244, 122, 267, 54, 132, 190, 250, 188, 121,
+	345, 230, 105, 86, 233, 77, 35, 119, 304, 10,
+	185, 327, 86, 303, 293, 294, 157, 315, 297, 79,
+	184, 186, 326, 163, 274, 185, 246, 247, 302, 325,
+	248, 324, 314, 162, 323, 184, 186, 299, 261, 313,
+	322, 235, 237, 239, 240, 241, 249, 251, 254, 255,
+	256, 257, 258, 262, 263, 164, 321, 236, 238, 242,
+	243, 245, 252, 253, 180, 126, 320, 259, 260, 179,
+	125, 165, 305, 319, 306, 308, 318, 310, 317, 130,
+	88, 129, 178, 124, 311, 312, 137, 138, 139, 140,
+	141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+	151, 195, 160, 161, 50, 163, 36, 167, 198, 331,
+	78, 332, 201, 228, 55, 162, 85, 227, 1, 340,
+	341, 342, 336, 49, 54, 343, 83, 347, 346, 349,
+	348, 48, 226, 47, 81, 355, 356, 164, 55, 86,
+	357, 53, 77, 301, 56, 8, 359, 22, 54, 37,
+	55, 175, 46, 165, 57, 128, 135, 127, 45, 43,
+	54, 364, 300, 59, 133, 174, 9, 9, 42, 134,
+	75, 41, 40, 51, 196, 358, 18, 19, 278, 87,
+	20, 194, 229, 80, 350, 156, 76, 58, 232, 52,
+	118, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+	70, 71, 72, 73, 74, 0, 0, 0, 13, 0,
+	0, 0, 24, 0, 30, 0, 0, 31, 32, 55,
+	38, 0, 53, 77, 0, 56, 280, 0, 22, 54,
+	0, 0, 0, 279, 0, 57, 0, 283, 284, 282,
+	289, 291, 288, 290, 285, 286, 287, 292, 0, 0,
+	0, 75, 0, 0, 0, 0, 0, 18, 19, 0,
+	0, 20, 0, 0, 0, 0, 0, 76, 0, 0,
+	0, 0, 61, 62, 63, 64, 65, 66, 67, 68,
+	69, 70, 71, 72, 73, 74, 0, 0, 0, 13,
+	0, 0, 0, 24, 0, 30, 0, 55, 31, 32,
+	53, 77, 0, 56, 335, 0, 22, 54, 0, 0,
+	0, 0, 0, 57, 0, 283, 284, 282, 289, 291,
+	288, 290, 285, 286, 287, 292, 0, 0, 0, 75,
+	0, 0, 0, 0, 0, 18, 19, 0, 0, 20,
+	0, 0, 0, 17, 77, 76, 0, 0, 0, 22,
+	61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+	71, 72, 73, 74, 0, 0, 0, 13, 0, 0,
+	0, 24, 0, 30, 0, 0, 31, 32, 18, 19,
+	0, 0, 20, 0, 0, 0, 17, 35, 0, 0,
+	0, 0, 22, 11, 12, 14, 15, 16, 21, 23,
+	25, 26, 27, 28, 29, 33, 34, 0, 0, 0,
+	13, 0, 0, 0, 24, 0, 30, 0, 0, 31,
+	32, 18, 19, 0, 0, 20, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 11, 12, 14, 15,
+	16, 21, 23, 25, 26, 27, 28, 29, 33, 34,
+	107, 0, 0, 13, 0, 0, 0, 24, 177, 30,
+	0, 0, 31, 32, 0, 0, 0, 0, 0, 107,
+	0, 0, 0, 0, 0, 0, 0, 89, 91, 92,
+	0, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+	102, 0, 103, 104, 106, 90, 89, 91, 92, 0,
+	93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+	0, 103, 104, 106, 90, 107, 0, 0, 0, 105,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 103,
+	0, 0, 0, 0, 107, 0, 0, 0, 105, 0,
+	0, 0, 89, 91, 92, 0, 93, 94, 95, 0,
+	97, 98, 99, 100, 101, 102, 0, 103, 104, 106,
+	90, 89, 91, 92, 0, 93, 94, 0, 0, 97,
+	98, 0, 100, 101, 102, 0, 103, 104, 106, 90,
+	0, 0, 0, 0, 105, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 105,
 }
 
 var yyPact = [...]int16{
-	28, 102, 569, 569, 405, 526, -1000, -1000, -1000, 98,
+	31, 169, 574, 574, 410, 531, -1000, -1000, -1000, 193,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 342, -1000, 204, -1000, 650,
+	-1000, -1000, -1000, -1000, -1000, 314, -1000, 278, -1000, 655,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 21, 93, -1000, -1000, 483, -1000, 483, 97,
+	-1000, -1000, 57, 147, -1000, -1000, 488, -1000, 488, 192,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 307, -1000, -1000,
-	338, -1000, -1000, 225, -1000, 23, -1000, -44, -44, -44,
-	-44, -44, -44, -44, -44, -44, -44, -44, -44, -44,
-	-44, -44, -44, 47, 171, 259, 93, -57, -1000, 249,
-	249, 324, -1000, 631, 75, -1000, 327, -1000, -1000, 222,
-	130, -1000, -1000, -1000, 298, -1000, 112, -1000, 159, 483,
-	-1000, -58, -48, -1000, 483, 483, 483, 483, 483, 483,
-	483, 483, 483, 483, 483, 483, 483, 483, 483, -1000,
-	39, -1000, -1000, 90, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 36, 36, 229, -1000, -1000, -1000, -1000, 174, -1000,
-	-1000, 180, -1000, 650, -1000, -1000, 301, -1000, 105, -1000,
-	-1000, -1000, -1000, -1000, 44, -1000, -1000, -1000, -1000, -1000,
-	18, 157, 83, -1000, -1000, -1000, 404, 15, 249, 249,
-	249, 249, 75, 75, 402, 402, 402, 715, 696, 402,
-	402, 715, 75, 75, 402, 75, 15, -1000, 19, -1000,
-	-1000, -1000, 186, -1000, 155, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 187, -1000, -1000,
+	263, -1000, -1000, 353, 277, -1000, -1000, 29, -1000, -53,
+	-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
+	-53, -53, -53, -53, -53, 26, 214, 305, 147, -56,
+	-1000, 126, 126, 329, -1000, 636, 24, -1000, 262, -1000,
+	-1000, 181, 166, -1000, -1000, 178, -1000, 171, -1000, 163,
+	-1000, 296, 488, -1000, -58, -50, -1000, 488, 488, 488,
+	488, 488, 488, 488, 488, 488, 488, 488, 488, 488,
+	488, 488, -1000, 175, -1000, -1000, 111, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 115, 115, 311, -1000, -1000, -1000,
+	-1000, 179, -1000, -1000, 64, -1000, 655, -1000, -1000, 162,
+	-1000, 141, -1000, -1000, -1000, -1000, -1000, 32, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 25, 80, 17, -1000, -1000,
+	-1000, 409, 8, 126, 126, 126, 126, 24, 24, 119,
+	119, 119, 720, 701, 119, 119, 720, 24, 24, 119,
+	24, 8, -1000, 40, -1000, -1000, -1000, 341, -1000, 206,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	483, -1000, -1000, -1000, -1000, -1000, -1000, 31, 31, 17,
-	31, 37, 37, 206, 34, -1000, -1000, 197, 191, 188,
-	185, 164, 161, 153, 133, 113, 111, 110, -1000, -1000,
-	-1000, -1000, -1000, -1000, 101, -1000, -1000, -1000, 13, -1000,
-	650, -1000, -1000, -1000, 31, -1000, 16, 11, 482, -1000,
-	-1000, -1000, 33, 163, 163, 163, 36, 40, 40, 33,
-	40, 33, -74, -1000, -1000, -1000, -1000, -1000, 31, 31,
-	-1000, -1000, -1000, 31, -1000, -1000, -1000, -1000, -1000, -1000,
-	163, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 38, -1000, 160, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 488, -1000, -1000, -1000, -1000,
+	-1000, -1000, 56, 56, 18, 56, 72, 72, 215, 70,
+	-1000, -1000, 272, 270, 267, 260, 250, 234, 228, 225,
+	223, 216, 205, -1000, -1000, -1000, -1000, -1000, -1000, 165,
+	-1000, -1000, -1000, 30, -1000, 655, -1000, -1000, -1000, 56,
+	-1000, 14, 13, 487, -1000, -1000, -1000, 22, 27, 27,
+	27, 115, 186, 186, 22, 186, 22, -74, -1000, -1000,
+	-1000, -1000, -1000, 56, 56, -1000, -1000, -1000, 56, -1000,
+	-1000, -1000, -1000, -1000, -1000, 27, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 52, -1000,
+	28, -1000, -1000, -1000, -1000,
 }
 
 var yyPgo = [...]int16{
-	0, 368, 12, 367, 5, 14, 366, 298, 364, 363,
-	361, 360, 265, 211, 359, 13, 357, 10, 11, 355,
-	353, 7, 352, 8, 4, 351, 2, 1, 3, 350,
-	27, 0, 348, 338, 17, 193, 328, 312, 6, 311,
-	308, 16, 307, 39, 297, 9, 281, 274, 273, 271,
-	234, 218, 299, 163, 161,
+	0, 390, 13, 389, 5, 15, 388, 363, 387, 385,
+	12, 384, 209, 345, 383, 14, 382, 10, 11, 381,
+	379, 7, 378, 8, 4, 375, 2, 1, 3, 374,
+	27, 0, 373, 372, 17, 195, 371, 369, 6, 368,
+	365, 16, 364, 56, 359, 9, 358, 356, 352, 333,
+	331, 323, 304, 318, 306,
 }
 
 var yyR1 = [...]int8{
@@ -554,18 +556,18 @@ var yyR1 = [...]int8{
 	13, 13, 7, 7, 7, 7, 7, 7, 7, 7,
 	7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	7, 7, 7, 7, 7, 7, 12, 12, 12, 12,
-	14, 14, 14, 15, 15, 15, 15, 54, 20, 20,
-	20, 20, 19, 19, 19, 19, 19, 19, 19, 19,
-	19, 29, 29, 29, 21, 21, 21, 21, 22, 22,
-	22, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-	23, 23, 24, 24, 25, 25, 25, 11, 11, 11,
-	11, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 3, 3, 6, 6, 6, 6, 6,
+	14, 14, 14, 15, 15, 15, 15, 15, 15, 15,
+	54, 20, 20, 20, 20, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 29, 29, 29, 21, 21, 21,
+	21, 22, 22, 22, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 24, 24, 25, 25, 25,
+	11, 11, 11, 11, 3, 3, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 3, 6, 6,
 	6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 	6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	6, 6, 6, 6, 8, 8, 5, 5, 5, 5,
-	45, 45, 28, 28, 30, 30, 31, 31, 27, 26,
-	26, 49, 10, 18, 18,
+	6, 6, 6, 6, 6, 6, 6, 8, 8, 5,
+	5, 5, 5, 45, 45, 28, 28, 30, 30, 31,
+	31, 27, 26, 26, 49, 10, 18, 18,
 }
 
 var yyR2 = [...]int8{
@@ -582,18 +584,18 @@ var yyR2 = [...]int8{
 	2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 3, 4, 2, 0,
-	3, 1, 2, 3, 3, 2, 1, 2, 0, 3,
-	2, 1, 1, 3, 1, 3, 4, 1, 3, 5,
-	5, 1, 1, 1, 4, 3, 3, 2, 3, 1,
-	2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 4, 3, 3, 1, 2, 1, 1, 1,
+	3, 1, 2, 3, 3, 3, 3, 2, 2, 1,
+	2, 0, 3, 2, 1, 1, 3, 1, 3, 4,
+	1, 3, 5, 5, 1, 1, 1, 4, 3, 3,
+	2, 3, 1, 2, 3, 3, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 4, 3, 3, 1, 2,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 2, 2, 1, 1, 1, 2,
-	1, 1, 1, 0, 1,
+	1, 1, 1, 1, 1, 1, 1, 2, 2, 1,
+	1, 1, 2, 1, 1, 1, 0, 1,
 }
 
 var yyChk = [...]int16{
@@ -605,34 +607,35 @@ var yyChk = [...]int16{
 	-52, -32, -3, 12, 19, 9, 15, 25, -8, -7,
 	-43, 62, 63, 64, 65, 66, 67, 68, 69, 70,
 	71, 72, 73, 74, 75, 41, 57, 13, -52, -12,
-	-14, 20, -15, 12, 2, -20, 2, 41, 59, 42,
-	43, 45, 46, 47, 48, 49, 50, 51, 52, 53,
-	54, 56, 57, 83, 58, 14, -34, -41, 2, 79,
-	85, 15, -41, -38, -38, -43, -1, 20, -2, 12,
-	-10, 2, 25, 20, 7, 2, 4, 2, 24, -35,
-	-42, -37, -47, 78, -35, -35, -35, -35, -35, -35,
-	-35, -35, -35, -35, -35, -35, -35, -35, -35, -45,
-	57, 2, -31, -9, 2, -28, -30, 88, 89, 19,
-	9, 41, 57, -45, 2, -41, -34, -17, 15, 2,
-	-17, -40, 22, -38, 22, 20, 7, 2, -5, 2,
-	4, 54, 44, 55, -5, 20, -15, 25, 2, -19,
-	5, -29, -21, 12, -28, -30, 16, -38, 82, 84,
-	80, 81, -38, -38, -38, -38, -38, -38, -38, -38,
-	-38, -38, -38, -38, -38, -38, -38, -45, 15, -28,
-	-28, 21, 6, 2, -16, 22, -4, -6, 25, 2,
-	62, 78, 63, 79, 64, 65, 66, 80, 81, 12,
-	82, 47, 48, 51, 67, 18, 68, 83, 84, 69,
-	70, 71, 72, 73, 88, 89, 59, 74, 75, 22,
-	7, 20, -2, 25, 2, 25, 2, 26, 26, -30,
-	26, 41, 57, -22, 24, 17, -23, 30, 28, 29,
-	35, 36, 37, 33, 31, 34, 32, 38, -17, -17,
-	-18, -17, -18, 22, -45, 21, 2, 22, 7, 2,
-	-38, -27, 19, -27, 26, -27, -21, -21, 24, 17,
-	2, 17, 6, 6, 6, 6, 6, 6, 6, 6,
-	6, 6, 6, 21, 2, 22, -4, -27, 26, 26,
-	17, -23, -26, 57, -27, -31, -31, -31, -28, -24,
-	14, -24, -26, -24, -26, -11, 92, 93, 94, 95,
-	-27, -27, -27, -25, -31, 24, 21, 2, 21, -31,
+	-14, 20, -15, 12, -10, 2, 25, -20, 2, 41,
+	59, 42, 43, 45, 46, 47, 48, 49, 50, 51,
+	52, 53, 54, 56, 57, 83, 58, 14, -34, -41,
+	2, 79, 85, 15, -41, -38, -38, -43, -1, 20,
+	-2, 12, -10, 2, 20, 7, 2, 4, 2, 4,
+	2, 24, -35, -42, -37, -47, 78, -35, -35, -35,
+	-35, -35, -35, -35, -35, -35, -35, -35, -35, -35,
+	-35, -35, -45, 57, 2, -31, -9, 2, -28, -30,
+	88, 89, 19, 9, 41, 57, -45, 2, -41, -34,
+	-17, 15, 2, -17, -40, 22, -38, 22, 20, 7,
+	2, -5, 2, 4, 54, 44, 55, -5, 20, -15,
+	25, 2, 25, 2, -19, 5, -29, -21, 12, -28,
+	-30, 16, -38, 82, 84, 80, 81, -38, -38, -38,
+	-38, -38, -38, -38, -38, -38, -38, -38, -38, -38,
+	-38, -38, -45, 15, -28, -28, 21, 6, 2, -16,
+	22, -4, -6, 25, 2, 62, 78, 63, 79, 64,
+	65, 66, 80, 81, 12, 82, 47, 48, 51, 67,
+	18, 68, 83, 84, 69, 70, 71, 72, 73, 88,
+	89, 59, 74, 75, 22, 7, 20, -2, 25, 2,
+	25, 2, 26, 26, -30, 26, 41, 57, -22, 24,
+	17, -23, 30, 28, 29, 35, 36, 37, 33, 31,
+	34, 32, 38, -17, -17, -18, -17, -18, 22, -45,
+	21, 2, 22, 7, 2, -38, -27, 19, -27, 26,
+	-27, -21, -21, 24, 17, 2, 17, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 21, 2,
+	22, -4, -27, 26, 26, 17, -23, -26, 57, -27,
+	-31, -31, -31, -28, -24, 14, -24, -26, -24, -26,
+	-11, 92, 93, 94, 95, -27, -27, -27, -25, -31,
+	24, 21, 2, 21, -31,
 }
 
 var yyDef = [...]int16{
@@ -641,37 +644,38 @@ var yyDef = [...]int16{
 	111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
 	121, 122, 123, 124, 125, 0, 2, -2, 3, 4,
 	8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
-	18, 19, 0, 108, 230, 231, 0, 241, 0, 85,
+	18, 19, 0, 108, 233, 234, 0, 244, 0, 85,
 	86, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-	-2, -2, -2, -2, -2, 224, 225, 0, 5, 100,
-	0, 128, 131, 0, 136, 137, 141, 43, 43, 43,
+	-2, -2, -2, -2, -2, 227, 228, 0, 5, 100,
+	0, 128, 131, 0, 0, 139, 245, 140, 144, 43,
 	43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-	43, 43, 43, 0, 0, 0, 0, 22, 23, 0,
-	0, 0, 61, 0, 83, 84, 0, 89, 91, 0,
-	95, 99, 242, 126, 0, 132, 0, 135, 140, 0,
-	42, 47, 48, 44, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 68,
-	0, 70, 71, 0, 73, 236, 237, 74, 75, 232,
-	233, 0, 0, 0, 82, 20, 21, 24, 0, 54,
-	25, 0, 63, 65, 67, 87, 0, 92, 0, 98,
-	226, 227, 228, 229, 0, 127, 130, 133, 134, 139,
-	142, 144, 147, 151, 152, 153, 0, 26, 0, 0,
-	-2, -2, 27, 28, 29, 30, 31, 32, 33, 34,
-	35, 36, 37, 38, 39, 40, 41, 69, 0, 234,
-	235, 76, 0, 81, 0, 53, 56, 58, 59, 60,
-	195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
-	205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
-	215, 216, 217, 218, 219, 220, 221, 222, 223, 62,
-	66, 88, 90, 93, 97, 94, 96, 0, 0, 0,
-	0, 0, 0, 0, 0, 157, 159, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 45, 46,
-	49, 244, 50, 72, 0, 78, 80, 51, 0, 57,
-	64, 143, 238, 145, 0, 148, 0, 0, 0, 155,
-	160, 156, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 77, 79, 52, 55, 146, 0, 0,
-	154, 158, 161, 0, 240, 162, 163, 164, 165, 166,
-	0, 167, 168, 169, 170, 171, 177, 178, 179, 180,
-	149, 150, 239, 0, 175, 0, 173, 176, 172, 174,
+	43, 43, 43, 43, 43, 0, 0, 0, 0, 22,
+	23, 0, 0, 0, 61, 0, 83, 84, 0, 89,
+	91, 0, 95, 99, 126, 0, 132, 0, 137, 0,
+	138, 143, 0, 42, 47, 48, 44, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 68, 0, 70, 71, 0, 73, 239, 240,
+	74, 75, 235, 236, 0, 0, 0, 82, 20, 21,
+	24, 0, 54, 25, 0, 63, 65, 67, 87, 0,
+	92, 0, 98, 229, 230, 231, 232, 0, 127, 130,
+	133, 135, 134, 136, 142, 145, 147, 150, 154, 155,
+	156, 0, 26, 0, 0, -2, -2, 27, 28, 29,
+	30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+	40, 41, 69, 0, 237, 238, 76, 0, 81, 0,
+	53, 56, 58, 59, 60, 198, 199, 200, 201, 202,
+	203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+	213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
+	223, 224, 225, 226, 62, 66, 88, 90, 93, 97,
+	94, 96, 0, 0, 0, 0, 0, 0, 0, 0,
+	160, 162, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 45, 46, 49, 247, 50, 72, 0,
+	78, 80, 51, 0, 57, 64, 146, 241, 148, 0,
+	151, 0, 0, 0, 158, 163, 159, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 77, 79,
+	52, 55, 149, 0, 0, 157, 161, 164, 0, 243,
+	165, 166, 167, 168, 169, 0, 170, 171, 172, 173,
+	174, 180, 181, 182, 183, 152, 153, 242, 0, 178,
+	0, 176, 179, 175, 177,
 }
 
 var yyTok1 = [...]int8{
@@ -1614,24 +1618,41 @@ yydefault:
 			yyVAL.label = labels.Label{Name: yyDollar[1].item.Val, Value: yylex.(*parser).unquoteString(yyDollar[3].item.Val)}
 		}
 	case 134:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yyVAL.label = labels.Label{Name: yyDollar[1].item.Val, Value: yylex.(*parser).unquoteString(yyDollar[3].item.Val)}
+		}
+	case 135:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yylex.(*parser).unexpected("label set", "string")
 			yyVAL.label = labels.Label{}
 		}
-	case 135:
+	case 136:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yylex.(*parser).unexpected("label set", "string")
+			yyVAL.label = labels.Label{}
+		}
+	case 137:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yylex.(*parser).unexpected("label set", "\"=\"")
 			yyVAL.label = labels.Label{}
 		}
-	case 136:
+	case 138:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		{
+			yylex.(*parser).unexpected("label set", "\"=\"")
+			yyVAL.label = labels.Label{}
+		}
+	case 139:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yylex.(*parser).unexpected("label set", "identifier or \"}\"")
 			yyVAL.label = labels.Label{}
 		}
-	case 137:
+	case 140:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yylex.(*parser).generatedParserResult = &seriesDescription{
@@ -1639,33 +1660,33 @@ yydefault:
 				values: yyDollar[2].series,
 			}
 		}
-	case 138:
+	case 141:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
 		}
-	case 139:
+	case 142:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.series = append(yyDollar[1].series, yyDollar[3].series...)
 		}
-	case 140:
+	case 143:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.series = yyDollar[1].series
 		}
-	case 141:
+	case 144:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yylex.(*parser).unexpected("series values", "")
 			yyVAL.series = nil
 		}
-	case 142:
+	case 145:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{{Omitted: true}}
 		}
-	case 143:
+	case 146:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
@@ -1673,12 +1694,12 @@ yydefault:
 				yyVAL.series = append(yyVAL.series, SequenceValue{Omitted: true})
 			}
 		}
-	case 144:
+	case 147:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{{Value: yyDollar[1].float}}
 		}
-	case 145:
+	case 148:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
@@ -1687,7 +1708,7 @@ yydefault:
 				yyVAL.series = append(yyVAL.series, SequenceValue{Value: yyDollar[1].float})
 			}
 		}
-	case 146:
+	case 149:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
@@ -1697,12 +1718,12 @@ yydefault:
 				yyDollar[1].float += yyDollar[2].float
 			}
 		}
-	case 147:
+	case 150:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{{Histogram: yyDollar[1].histogram}}
 		}
-	case 148:
+	case 151:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
@@ -1712,7 +1733,7 @@ yydefault:
 				//$1 += $2
 			}
 		}
-	case 149:
+	case 152:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		{
 			val, err := yylex.(*parser).histogramsIncreaseSeries(yyDollar[1].histogram, yyDollar[3].histogram, yyDollar[5].uint)
@@ -1721,7 +1742,7 @@ yydefault:
 			}
 			yyVAL.series = val
 		}
-	case 150:
+	case 153:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		{
 			val, err := yylex.(*parser).histogramsDecreaseSeries(yyDollar[1].histogram, yyDollar[3].histogram, yyDollar[5].uint)
@@ -1730,7 +1751,7 @@ yydefault:
 			}
 			yyVAL.series = val
 		}
-	case 151:
+	case 154:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			if yyDollar[1].item.Val != "stale" {
@@ -1738,130 +1759,130 @@ yydefault:
 			}
 			yyVAL.float = math.Float64frombits(value.StaleNaN)
 		}
-	case 154:
+	case 157:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		{
 			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&yyDollar[2].descriptors)
 		}
-	case 155:
+	case 158:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&yyDollar[2].descriptors)
 		}
-	case 156:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		{
-			m := yylex.(*parser).newMap()
-			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&m)
-		}
-	case 157:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		{
-			m := yylex.(*parser).newMap()
-			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&m)
-		}
-	case 158:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		{
-			yyVAL.descriptors = *(yylex.(*parser).mergeMaps(&yyDollar[1].descriptors, &yyDollar[3].descriptors))
-		}
 	case 159:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yyVAL.descriptors = yyDollar[1].descriptors
+			m := yylex.(*parser).newMap()
+			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&m)
 		}
 	case 160:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
-			yylex.(*parser).unexpected("histogram description", "histogram description key, e.g. buckets:[5 10 7]")
+			m := yylex.(*parser).newMap()
+			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&m)
 		}
 	case 161:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["schema"] = yyDollar[3].int
+			yyVAL.descriptors = *(yylex.(*parser).mergeMaps(&yyDollar[1].descriptors, &yyDollar[3].descriptors))
 		}
 	case 162:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		{
-			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["sum"] = yyDollar[3].float
+			yyVAL.descriptors = yyDollar[1].descriptors
 		}
 	case 163:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		{
-			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["count"] = yyDollar[3].float
+			yylex.(*parser).unexpected("histogram description", "histogram description key, e.g. buckets:[5 10 7]")
 		}
 	case 164:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["z_bucket"] = yyDollar[3].float
+			yyVAL.descriptors["schema"] = yyDollar[3].int
 		}
 	case 165:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["z_bucket_w"] = yyDollar[3].float
+			yyVAL.descriptors["sum"] = yyDollar[3].float
 		}
 	case 166:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["custom_values"] = yyDollar[3].bucket_set
+			yyVAL.descriptors["count"] = yyDollar[3].float
 		}
 	case 167:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["buckets"] = yyDollar[3].bucket_set
+			yyVAL.descriptors["z_bucket"] = yyDollar[3].float
 		}
 	case 168:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["offset"] = yyDollar[3].int
+			yyVAL.descriptors["z_bucket_w"] = yyDollar[3].float
 		}
 	case 169:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["n_buckets"] = yyDollar[3].bucket_set
+			yyVAL.descriptors["custom_values"] = yyDollar[3].bucket_set
 		}
 	case 170:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["n_offset"] = yyDollar[3].int
+			yyVAL.descriptors["buckets"] = yyDollar[3].bucket_set
 		}
 	case 171:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["counter_reset_hint"] = yyDollar[3].item
+			yyVAL.descriptors["offset"] = yyDollar[3].int
 		}
 	case 172:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yyVAL.bucket_set = yyDollar[2].bucket_set
+			yyVAL.descriptors = yylex.(*parser).newMap()
+			yyVAL.descriptors["n_buckets"] = yyDollar[3].bucket_set
 		}
 	case 173:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yyVAL.bucket_set = yyDollar[2].bucket_set
+			yyVAL.descriptors = yylex.(*parser).newMap()
+			yyVAL.descriptors["n_offset"] = yyDollar[3].int
 		}
 	case 174:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yyVAL.bucket_set = append(yyDollar[1].bucket_set, yyDollar[3].float)
+			yyVAL.descriptors = yylex.(*parser).newMap()
+			yyVAL.descriptors["counter_reset_hint"] = yyDollar[3].item
 		}
 	case 175:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		{
+			yyVAL.bucket_set = yyDollar[2].bucket_set
+		}
+	case 176:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yyVAL.bucket_set = yyDollar[2].bucket_set
+		}
+	case 177:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yyVAL.bucket_set = append(yyDollar[1].bucket_set, yyDollar[3].float)
+		}
+	case 178:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.bucket_set = []float64{yyDollar[1].float}
 		}
-	case 230:
+	case 233:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.node = &NumberLiteral{
@@ -1869,7 +1890,7 @@ yydefault:
 				PosRange: yyDollar[1].item.PositionRange(),
 			}
 		}
-	case 231:
+	case 234:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			var err error
@@ -1883,12 +1904,12 @@ yydefault:
 				PosRange: yyDollar[1].item.PositionRange(),
 			}
 		}
-	case 232:
+	case 235:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.float = yylex.(*parser).number(yyDollar[1].item.Val)
 		}
-	case 233:
+	case 236:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			var err error
@@ -1899,17 +1920,17 @@ yydefault:
 			}
 			yyVAL.float = dur.Seconds()
 		}
-	case 234:
+	case 237:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.float = yyDollar[2].float
 		}
-	case 235:
+	case 238:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.float = -yyDollar[2].float
 		}
-	case 238:
+	case 241:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			var err error
@@ -1918,17 +1939,17 @@ yydefault:
 				yylex.(*parser).addParseErrf(yyDollar[1].item.PositionRange(), "invalid repetition in series values: %s", err)
 			}
 		}
-	case 239:
+	case 242:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.int = -int64(yyDollar[2].uint)
 		}
-	case 240:
+	case 243:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.int = int64(yyDollar[1].uint)
 		}
-	case 241:
+	case 244:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.node = &StringLiteral{
@@ -1936,7 +1957,7 @@ yydefault:
 				PosRange: yyDollar[1].item.PositionRange(),
 			}
 		}
-	case 242:
+	case 245:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.item = Item{
@@ -1945,7 +1966,7 @@ yydefault:
 				Val: yylex.(*parser).unquoteString(yyDollar[1].item.Val),
 			}
 		}
-	case 243:
+	case 246:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		{
 			yyVAL.strings = nil
diff --git a/web/api/v1/api.go b/web/api/v1/api.go
index b37605f5d..c61e7984f 100644
--- a/web/api/v1/api.go
+++ b/web/api/v1/api.go
@@ -744,7 +744,8 @@ func (api *API) labelValues(r *http.Request) (result apiFuncResult) {
 	ctx := r.Context()
 	name := route.Param(ctx, "name")
 
-	if !model.LabelNameRE.MatchString(name) {
+	label := model.LabelName(name)
+	if !label.IsValid() {
 		return apiFuncResult{nil, &apiError{errorBadData, fmt.Errorf("invalid label name: %q", name)}, nil, nil}
 	}
 
diff --git a/web/api/v1/api_test.go b/web/api/v1/api_test.go
index 35ad4a9ad..4cf5ec36e 100644
--- a/web/api/v1/api_test.go
+++ b/web/api/v1/api_test.go
@@ -387,6 +387,7 @@ func TestEndpoints(t *testing.T) {
 			test_metric4{foo="bar", dup="1"} 1+0x100
 			test_metric4{foo="boo", dup="1"} 1+0x100
 			test_metric4{foo="boo"} 1+0x100
+			test_metric5{"host.name"="localhost"} 1+0x100
 	`)
 	t.Cleanup(func() { storage.Close() })
 
@@ -1117,6 +1118,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 		metadata              []targetMetadata
 		exemplars             []exemplar.QueryResult
 		zeroFunc              func(interface{})
+		nameValidationScheme  model.ValidationScheme
 	}
 
 	rulesZeroFunc := func(i interface{}) {
@@ -2996,6 +2998,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 					"test_metric2",
 					"test_metric3",
 					"test_metric4",
+					"test_metric5",
 				},
 			},
 			{
@@ -3008,13 +3011,25 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 					"boo",
 				},
 			},
-			// Bad name parameter.
+			// Bad name parameter for legacy validation.
 			{
 				endpoint: api.labelValues,
 				params: map[string]string{
-					"name": "not!!!allowed",
+					"name": "host.name",
+				},
+				nameValidationScheme: model.LegacyValidation,
+				errType:              errorBadData,
+			},
+			// Valid utf8 name parameter for utf8 validation.
+			{
+				endpoint: api.labelValues,
+				params: map[string]string{
+					"name": "host.name",
+				},
+				nameValidationScheme: model.UTF8Validation,
+				response: []string{
+					"localhost",
 				},
-				errType: errorBadData,
 			},
 			// Start and end before LabelValues starts.
 			{
@@ -3250,15 +3265,15 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 					"name": "__name__",
 				},
 				query: url.Values{
-					"limit": []string{"4"},
+					"limit": []string{"5"},
 				},
-				responseLen:   4, // API does not specify which particular values will come back.
+				responseLen:   5, // API does not specify which particular values will come back.
 				warningsCount: 0, // No warnings if limit isn't exceeded.
 			},
 			// Label names.
 			{
 				endpoint: api.labelNames,
-				response: []string{"__name__", "dup", "foo"},
+				response: []string{"__name__", "dup", "foo", "host.name"},
 			},
 			// Start and end before Label names starts.
 			{
@@ -3276,7 +3291,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 					"start": []string{"1"},
 					"end":   []string{"100"},
 				},
-				response: []string{"__name__", "dup", "foo"},
+				response: []string{"__name__", "dup", "foo", "host.name"},
 			},
 			// Start before Label names, end within Label names.
 			{
@@ -3285,7 +3300,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 					"start": []string{"-1"},
 					"end":   []string{"10"},
 				},
-				response: []string{"__name__", "dup", "foo"},
+				response: []string{"__name__", "dup", "foo", "host.name"},
 			},
 
 			// Start before Label names starts, end after Label names ends.
@@ -3295,7 +3310,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 					"start": []string{"-1"},
 					"end":   []string{"100000"},
 				},
-				response: []string{"__name__", "dup", "foo"},
+				response: []string{"__name__", "dup", "foo", "host.name"},
 			},
 			// Start with bad data for Label names, end within Label names.
 			{
@@ -3313,7 +3328,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 					"start": []string{"1"},
 					"end":   []string{"1000000006"},
 				},
-				response: []string{"__name__", "dup", "foo"},
+				response: []string{"__name__", "dup", "foo", "host.name"},
 			},
 			// Start and end after Label names ends.
 			{
@@ -3330,7 +3345,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 				query: url.Values{
 					"start": []string{"4"},
 				},
-				response: []string{"__name__", "dup", "foo"},
+				response: []string{"__name__", "dup", "foo", "host.name"},
 			},
 			// Only provide End within Label names, don't provide a start time.
 			{
@@ -3338,7 +3353,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 				query: url.Values{
 					"end": []string{"20"},
 				},
-				response: []string{"__name__", "dup", "foo"},
+				response: []string{"__name__", "dup", "foo", "host.name"},
 			},
 			// Label names with bad matchers.
 			{
@@ -3406,9 +3421,9 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 			{
 				endpoint: api.labelNames,
 				query: url.Values{
-					"limit": []string{"3"},
+					"limit": []string{"4"},
 				},
-				responseLen:   3, // API does not specify which particular values will come back.
+				responseLen:   4, // API does not specify which particular values will come back.
 				warningsCount: 0, // No warnings if limit isn't exceeded.
 			},
 		}...)
@@ -3444,6 +3459,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
 						ctx = route.WithParam(ctx, p, v)
 					}
 
+					model.NameValidationScheme = test.nameValidationScheme
+
 					req, err := request(method, test.query)
 					require.NoError(t, err)