diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go
index 1d46327b4..c41d38c53 100644
--- a/encoding/proto/proto.go
+++ b/encoding/proto/proto.go
@@ -516,7 +516,7 @@ func (s Serializer) encodeQueryResponse(m *pilosa.QueryResponse) *internal.Query
 			pb.Results[i].Pairs = []*internal.Pair{s.encodePair(result)}
 		case pilosa.PairField:
 			pb.Results[i].Type = queryResultTypePairField
-			pb.Results[i].Pairs = []*internal.Pair{s.encodePairField(result)}
+			pb.Results[i].PairField = s.encodePairField(result)
 		case nil:
 			pb.Results[i].Type = queryResultTypeNil
 		default:
@@ -1311,7 +1311,7 @@ func (s Serializer) decodeQueryResult(pb *internal.QueryResult) interface{} {
 	case queryResultTypePair:
 		return s.decodePair(pb.Pairs[0])
 	case queryResultTypePairField:
-		return s.decodePairField(pb.Pairs[0])
+		return s.decodePairField(pb.PairField)
 	}
 	panic(fmt.Sprintf("unknown type: %d", pb.Type))
 }
@@ -1441,14 +1441,14 @@ func (s Serializer) decodePair(pb *internal.Pair) pilosa.Pair {
 	}
 }
 
-func (s Serializer) decodePairField(pb *internal.Pair) pilosa.PairField {
+func (s Serializer) decodePairField(pb *internal.PairField) pilosa.PairField {
 	return pilosa.PairField{
 		Pair: pilosa.Pair{
-			ID:    pb.ID,
-			Key:   pb.Key,
-			Count: pb.Count,
+			ID:    pb.Pair.ID,
+			Key:   pb.Pair.Key,
+			Count: pb.Pair.Count,
 		},
-		//Field: pb.Field, // TODO: in order to have this, we need PairField in QueryResponse.
+		Field: pb.Field,
 	}
 }
 
@@ -1576,15 +1576,11 @@ func (s Serializer) encodePair(p pilosa.Pair) *internal.Pair {
 	}
 }
 
-func (s Serializer) encodePairField(p pilosa.PairField) *internal.Pair {
-	/*
-		// TODO: in order to have this, we need PairField in QueryResponse.
-		return &internal.Pair{
-			Pair:  s.encodePair(p.Pair),
-			Field: p.Field,
-		}
-	*/
-	return s.encodePair(p.Pair)
+func (s Serializer) encodePairField(p pilosa.PairField) *internal.PairField {
+	return &internal.PairField{
+		Pair:  s.encodePair(p.Pair),
+		Field: p.Field,
+	}
 }
 
 func (s Serializer) encodeValCount(vc pilosa.ValCount) *internal.ValCount {
diff --git a/internal/public.pb.go b/internal/public.pb.go
index ff033abf7..bf04b2d90 100644
--- a/internal/public.pb.go
+++ b/internal/public.pb.go
@@ -1051,6 +1051,7 @@ type QueryResult struct {
 	RowIdentifiers       *RowIdentifiers `protobuf:"bytes,9,opt,name=RowIdentifiers,proto3" json:"RowIdentifiers,omitempty"`
 	SignedRow            *SignedRow      `protobuf:"bytes,10,opt,name=SignedRow,proto3" json:"SignedRow,omitempty"`
 	PairsField           *PairsField     `protobuf:"bytes,11,opt,name=PairsField,proto3" json:"PairsField,omitempty"`
+	PairField            *PairField      `protobuf:"bytes,12,opt,name=PairField,proto3" json:"PairField,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -1166,6 +1167,13 @@ func (m *QueryResult) GetPairsField() *PairsField {
 	return nil
 }
 
+func (m *QueryResult) GetPairField() *PairField {
+	if m != nil {
+		return m.PairField
+	}
+	return nil
+}
+
 type ImportRequest struct {
 	Index                string   `protobuf:"bytes,1,opt,name=Index,proto3" json:"Index,omitempty"`
 	Field                string   `protobuf:"bytes,2,opt,name=Field,proto3" json:"Field,omitempty"`
@@ -1829,82 +1837,83 @@ func init() {
 func init() { proto.RegisterFile("public.proto", fileDescriptor_413a91106d7bcce8) }
 
 var fileDescriptor_413a91106d7bcce8 = []byte{
-	// 1196 bytes of a gzipped FileDescriptorProto
+	// 1207 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x8e, 0x1b, 0x45,
 	0x10, 0xa6, 0x3d, 0xe3, 0xb5, 0x5d, 0xf6, 0x6e, 0x42, 0xc7, 0x09, 0x23, 0x14, 0x36, 0x56, 0x2b,
-	0x20, 0xc3, 0x61, 0xa3, 0x84, 0x10, 0xe5, 0x04, 0x64, 0xe3, 0x0d, 0x58, 0x51, 0x56, 0xa1, 0xbd,
+	0x20, 0xc3, 0x61, 0xa3, 0x0d, 0x21, 0xca, 0x09, 0xc8, 0xc6, 0x1b, 0xb0, 0xa2, 0xac, 0x42, 0x3b,
 	0x32, 0x37, 0xa4, 0x59, 0xbb, 0xd9, 0x8c, 0x18, 0xcf, 0x98, 0xf9, 0xc1, 0xd9, 0x23, 0xcf, 0x00,
-	0x07, 0xc4, 0x13, 0xf0, 0x0e, 0xbc, 0x00, 0x47, 0x1e, 0x01, 0x96, 0x37, 0xe0, 0xca, 0x05, 0x55,
-	0xf5, 0xb4, 0xbb, 0xed, 0xf5, 0x2e, 0x51, 0xc4, 0xad, 0xbf, 0xaa, 0xea, 0xea, 0xfa, 0x6a, 0xaa,
-	0xab, 0x7a, 0xa0, 0x33, 0x2f, 0x8f, 0xe3, 0x68, 0xb2, 0x37, 0xcf, 0xd2, 0x22, 0xe5, 0xcd, 0x28,
-	0x29, 0x54, 0x96, 0x84, 0xb1, 0xc8, 0xc1, 0x93, 0xe9, 0x82, 0x07, 0xd0, 0x78, 0x9c, 0xc6, 0xe5,
-	0x2c, 0xc9, 0x03, 0xd6, 0xf3, 0xfa, 0xbe, 0x34, 0x90, 0x73, 0xf0, 0x9f, 0xaa, 0xd3, 0x3c, 0xf0,
-	0x7a, 0x5e, 0xbf, 0x25, 0x69, 0xcd, 0x6f, 0x43, 0xfd, 0x51, 0x51, 0x64, 0x79, 0x50, 0xeb, 0x79,
-	0xfd, 0xf6, 0xbd, 0x9d, 0x3d, 0xe3, 0x6e, 0x0f, 0xc5, 0x52, 0x2b, 0xd1, 0xa7, 0x4c, 0xc3, 0x2c,
-	0x4a, 0x4e, 0x02, 0xbf, 0xc7, 0xfa, 0x1d, 0x69, 0xa0, 0x78, 0x06, 0xad, 0x51, 0x74, 0x92, 0xa8,
-	0x29, 0x1e, 0x7d, 0x0b, 0xbc, 0xe7, 0x29, 0x1e, 0xcb, 0xfa, 0xed, 0x7b, 0xdb, 0xd6, 0x95, 0x4c,
-	0x17, 0x12, 0x35, 0x68, 0x70, 0xa8, 0x4e, 0x82, 0xda, 0x46, 0x83, 0x43, 0x75, 0x22, 0x1e, 0xc2,
-	0x8e, 0x4c, 0x17, 0xc3, 0xa9, 0x4a, 0x8a, 0xe8, 0xeb, 0x48, 0x65, 0x14, 0xb4, 0x4c, 0x17, 0x86,
-	0x0b, 0xad, 0x97, 0x44, 0x6a, 0x96, 0x88, 0xf8, 0x18, 0xfc, 0xe7, 0x61, 0x94, 0xf1, 0x1d, 0xa8,
-	0x0d, 0x07, 0x14, 0x82, 0x2f, 0x6b, 0xc3, 0x01, 0xbf, 0x0a, 0xde, 0x53, 0x75, 0x1a, 0x78, 0x3d,
-	0xd6, 0x6f, 0x49, 0x5c, 0xf2, 0x2e, 0xd4, 0x1f, 0xa7, 0x65, 0x52, 0x50, 0x18, 0xbe, 0xd4, 0x40,
-	0x1c, 0x40, 0x0b, 0xf7, 0x3f, 0x89, 0x54, 0x3c, 0xe5, 0x42, 0x3b, 0xab, 0x98, 0x38, 0x49, 0x41,
-	0xa9, 0xd4, 0x07, 0x75, 0xa1, 0x4e, 0xc6, 0xe4, 0xa6, 0x25, 0x35, 0x10, 0x9f, 0x03, 0xa0, 0x36,
-	0xd7, 0x7e, 0x6e, 0x43, 0x9d, 0x10, 0x45, 0x7f, 0xde, 0x91, 0x56, 0x5e, 0xe0, 0xe9, 0x1d, 0xa8,
-	0x0f, 0x93, 0xe2, 0xc1, 0x7d, 0x54, 0x8f, 0xc3, 0xb8, 0x54, 0x14, 0x8d, 0x27, 0x35, 0x10, 0x25,
-	0x34, 0xc9, 0x0e, 0xf3, 0xbe, 0x74, 0xc0, 0x1c, 0x07, 0x28, 0xc5, 0x5c, 0x0e, 0x0c, 0x4f, 0x02,
-	0xfc, 0x06, 0x6c, 0xc9, 0x74, 0x61, 0x53, 0x52, 0x21, 0xfe, 0xae, 0x39, 0xc5, 0x27, 0xce, 0x57,
-	0x6c, 0xa8, 0x14, 0x85, 0x39, 0xf6, 0x2b, 0x80, 0xcf, 0xb2, 0xb4, 0x9c, 0x53, 0xd2, 0x78, 0x1f,
-	0xea, 0x84, 0x2a, 0x7e, 0xdc, 0x6e, 0x32, 0xb1, 0x49, 0x6d, 0xb0, 0x39, 0xe9, 0xf8, 0x71, 0x46,
-	0xe5, 0x8c, 0x22, 0xf1, 0x24, 0x2e, 0xc5, 0xf7, 0x0c, 0x9a, 0xe3, 0x30, 0x5e, 0xaa, 0xc7, 0x61,
-	0x5c, 0xf1, 0xc6, 0xe5, 0xaa, 0x1b, 0xcf, 0xb8, 0x79, 0x1b, 0x9a, 0x4f, 0xe2, 0x34, 0x2c, 0xd0,
-	0x18, 0x7d, 0x31, 0xb9, 0xc4, 0xfc, 0x2e, 0xc0, 0x40, 0x4d, 0xa2, 0x59, 0x18, 0xa3, 0x56, 0x93,
-	0x7b, 0xd3, 0xc6, 0x59, 0xe9, 0xa4, 0x63, 0x24, 0x3e, 0x82, 0x46, 0x85, 0x36, 0xe7, 0x1e, 0xa5,
-	0xa3, 0x49, 0x18, 0x2b, 0x13, 0x05, 0x01, 0xf1, 0x25, 0x6c, 0xeb, 0x9b, 0x86, 0x77, 0x66, 0xa4,
-	0x8a, 0x57, 0x28, 0xc5, 0x57, 0xba, 0x7d, 0xe2, 0x17, 0x06, 0x3e, 0xae, 0x8c, 0x03, 0x66, 0x1d,
-	0x70, 0xf0, 0x8f, 0x4e, 0xe7, 0xaa, 0xca, 0x2a, 0xad, 0x79, 0x0f, 0xda, 0xa3, 0x02, 0x2f, 0xa7,
-	0x8e, 0x5c, 0x1f, 0xe7, 0x8a, 0x30, 0x5f, 0xc3, 0xa4, 0xb0, 0x9f, 0xdb, 0x93, 0x4b, 0xcc, 0x6f,
-	0x42, 0x6b, 0x3f, 0x4d, 0x63, 0xad, 0xac, 0xf7, 0x58, 0xbf, 0x29, 0xad, 0x80, 0xef, 0x02, 0x98,
-	0xcc, 0x96, 0x2a, 0xd8, 0xa2, 0x5c, 0x3b, 0x12, 0x71, 0x07, 0x1a, 0x18, 0xe9, 0xb3, 0x70, 0x6e,
-	0xb9, 0xb1, 0xcb, 0xb8, 0xfd, 0xc3, 0xa0, 0xf3, 0x45, 0xa9, 0xb2, 0x53, 0xa9, 0xbe, 0x2d, 0x55,
-	0x5e, 0x60, 0x6e, 0x09, 0x9b, 0x5a, 0x26, 0x80, 0x55, 0x3b, 0x7a, 0x11, 0x66, 0x53, 0x9d, 0x29,
-	0x5f, 0x56, 0x08, 0xb9, 0xda, 0x9c, 0xe7, 0xc4, 0xb5, 0x29, 0x5d, 0x11, 0xd5, 0xbb, 0x9a, 0xa5,
-	0x85, 0x21, 0x53, 0x21, 0xde, 0x87, 0x2b, 0x07, 0x2f, 0x27, 0x71, 0x39, 0x55, 0x32, 0x5d, 0xe8,
-	0xdd, 0x5b, 0x64, 0xb0, 0x2e, 0xe6, 0xef, 0xc1, 0x4e, 0x25, 0x32, 0x7d, 0xb5, 0x41, 0x86, 0x6b,
-	0x52, 0x7e, 0x17, 0x3a, 0x07, 0xb3, 0x63, 0x35, 0x9d, 0xaa, 0xe9, 0x20, 0x2c, 0xc2, 0xa0, 0x49,
-	0xbc, 0xd7, 0xba, 0xdc, 0x8a, 0x89, 0xf8, 0x81, 0xc1, 0x76, 0xc5, 0x3e, 0x9f, 0xa7, 0x49, 0xae,
-	0xf0, 0x13, 0x1f, 0x64, 0x99, 0xf9, 0xc4, 0x07, 0x59, 0xc6, 0xef, 0x40, 0x43, 0xaa, 0xbc, 0x8c,
-	0x0b, 0x53, 0x25, 0xd7, 0xad, 0x47, 0xb3, 0xb7, 0x8c, 0x0b, 0x69, 0xac, 0xf8, 0x27, 0xb0, 0xb3,
-	0x52, 0x87, 0xba, 0xe1, 0xb7, 0xef, 0xbd, 0x65, 0xf7, 0xad, 0xe8, 0xe5, 0x9a, 0xb9, 0xf8, 0xd5,
-	0x83, 0xb6, 0xe3, 0x79, 0x59, 0x64, 0x98, 0x9f, 0xed, 0xaa, 0xc8, 0x6e, 0xd1, 0xb0, 0xb9, 0xa0,
-	0xd5, 0x63, 0x4f, 0xea, 0x00, 0x3b, 0xac, 0xca, 0x92, 0x1d, 0xda, 0x46, 0xe8, 0x5d, 0xd6, 0x08,
-	0x71, 0x74, 0xbd, 0x08, 0x93, 0x13, 0x35, 0xa5, 0xb2, 0x6c, 0x4a, 0x03, 0xf9, 0x9e, 0xed, 0x0a,
-	0xf4, 0x1d, 0x57, 0x7a, 0x8d, 0xd1, 0x48, 0xdb, 0x39, 0x74, 0x97, 0x1b, 0x0e, 0xf0, 0x5b, 0x51,
-	0xbd, 0x68, 0xc4, 0x1f, 0x40, 0xdb, 0xb6, 0xaf, 0xbc, 0xfa, 0x44, 0x5d, 0xeb, 0xca, 0x2a, 0xa5,
-	0x6b, 0xc8, 0x3f, 0x5d, 0x9f, 0x4b, 0x41, 0x8b, 0xa2, 0x08, 0x56, 0x98, 0x3b, 0x7a, 0xb9, 0x3e,
-	0xc7, 0xee, 0x3a, 0x83, 0x32, 0x00, 0xda, 0x7c, 0xcd, 0x6e, 0x5e, 0xaa, 0xa4, 0x33, 0x4e, 0xef,
-	0xbb, 0xb3, 0x24, 0x68, 0xd3, 0x9e, 0xee, 0x6a, 0xe6, 0xb4, 0x4e, 0x3a, 0x76, 0xe2, 0x4f, 0x06,
-	0xdb, 0xc3, 0xd9, 0x3c, 0xcd, 0x0a, 0xe7, 0x4a, 0x0d, 0x93, 0xa9, 0x7a, 0x69, 0xae, 0x14, 0x81,
-	0xcd, 0x53, 0x87, 0x5a, 0x1b, 0x5e, 0x2d, 0xba, 0x4a, 0xbe, 0xd4, 0xc0, 0x49, 0xa7, 0xbf, 0x92,
-	0xce, 0x9b, 0xd0, 0xd2, 0xb5, 0x83, 0xaa, 0x3a, 0xa9, 0xac, 0x40, 0xbf, 0x1a, 0x16, 0x34, 0xa9,
-	0x1b, 0x34, 0xa9, 0x0d, 0xc4, 0x36, 0xa2, 0xcd, 0x48, 0xd9, 0x24, 0xa5, 0x23, 0x41, 0xfd, 0x51,
-	0x34, 0x53, 0x79, 0x11, 0xce, 0xe6, 0x78, 0x2f, 0xbd, 0xbe, 0x27, 0x1d, 0x89, 0xf8, 0x9b, 0x01,
-	0xd7, 0x1c, 0xa9, 0xed, 0xfc, 0x7f, 0x44, 0x2f, 0x27, 0xb4, 0x1a, 0x76, 0xe3, 0x5c, 0xd8, 0x37,
-	0x60, 0x8b, 0xe2, 0x31, 0x21, 0x57, 0x08, 0xbb, 0x94, 0xed, 0x91, 0x9a, 0x2f, 0x93, 0xae, 0x88,
-	0x0b, 0xe8, 0x38, 0x0d, 0x1a, 0xab, 0x0b, 0x7d, 0xaf, 0xc8, 0xc4, 0x18, 0xba, 0x47, 0x59, 0x98,
-	0xe4, 0x71, 0x58, 0x28, 0x3c, 0xee, 0x75, 0x58, 0x6f, 0x78, 0x02, 0x8a, 0xf7, 0xe1, 0xfa, 0x9a,
-	0x5f, 0xdb, 0x8b, 0x30, 0x0d, 0x1e, 0xa5, 0x01, 0x97, 0x62, 0x04, 0xd7, 0x96, 0xa6, 0xc3, 0xc1,
-	0x6b, 0x45, 0x70, 0xde, 0xe9, 0x07, 0x0e, 0x2f, 0x72, 0x5a, 0x1d, 0xbf, 0x29, 0xd6, 0x7d, 0x08,
-	0xaa, 0xda, 0xd6, 0xef, 0xcf, 0x2a, 0x82, 0x71, 0xa4, 0x16, 0x68, 0x7f, 0x18, 0xce, 0x54, 0x15,
-	0x04, 0xad, 0x51, 0x46, 0xbd, 0xb8, 0x46, 0xaf, 0x56, 0x5a, 0x8b, 0x1f, 0x19, 0x74, 0x37, 0x39,
-	0xa1, 0xc7, 0x45, 0xac, 0x42, 0xdd, 0x7d, 0x9b, 0x52, 0x03, 0xfe, 0x10, 0xea, 0xdf, 0x45, 0x6a,
-	0x61, 0xba, 0xaf, 0x70, 0x1e, 0x46, 0x17, 0x44, 0x22, 0xf5, 0x06, 0x2c, 0x87, 0x47, 0x93, 0x22,
-	0x4a, 0x13, 0xf3, 0xd4, 0xd2, 0x08, 0xcf, 0xd9, 0x8f, 0xd3, 0xc9, 0x37, 0xd4, 0xe4, 0x7c, 0xa9,
-	0x81, 0xf8, 0x99, 0x19, 0x6e, 0xce, 0xf8, 0xfa, 0xcf, 0x0c, 0xeb, 0x1a, 0x36, 0xef, 0x10, 0xaa,
-	0xe1, 0x40, 0xcf, 0x60, 0xfb, 0xd4, 0x30, 0x10, 0xe7, 0x3e, 0x2e, 0xc7, 0x61, 0xac, 0x2f, 0x72,
-	0x4b, 0x2e, 0xf1, 0xe5, 0x95, 0xbf, 0x7f, 0xf5, 0xb7, 0xb3, 0x5d, 0xf6, 0xfb, 0xd9, 0x2e, 0xfb,
-	0xe3, 0x6c, 0x97, 0xfd, 0xf4, 0xd7, 0xee, 0x1b, 0xc7, 0x5b, 0xf4, 0xfb, 0xf1, 0xe1, 0xbf, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x2b, 0xc8, 0xa6, 0x89, 0x8e, 0x0c, 0x00, 0x00,
+	0x07, 0xc4, 0x13, 0xf0, 0x28, 0x1c, 0x79, 0x04, 0x58, 0xee, 0x1c, 0xb8, 0x72, 0x41, 0x55, 0x3d,
+	0xed, 0x6e, 0x7b, 0xbd, 0x4b, 0x14, 0x71, 0xeb, 0xaf, 0xaa, 0xa6, 0xba, 0xbe, 0xea, 0xea, 0xaa,
+	0x1e, 0xe8, 0xcc, 0xcb, 0xe3, 0x38, 0x9a, 0xec, 0xcd, 0xb3, 0xb4, 0x48, 0x79, 0x33, 0x4a, 0x0a,
+	0x95, 0x25, 0x61, 0x2c, 0x72, 0xf0, 0x64, 0xba, 0xe0, 0x01, 0x34, 0x1e, 0xa5, 0x71, 0x39, 0x4b,
+	0xf2, 0x80, 0xf5, 0xbc, 0xbe, 0x2f, 0x0d, 0xe4, 0x1c, 0xfc, 0x27, 0xea, 0x34, 0x0f, 0xbc, 0x9e,
+	0xd7, 0x6f, 0x49, 0x5a, 0xf3, 0xdb, 0x50, 0x7f, 0x58, 0x14, 0x59, 0x1e, 0xd4, 0x7a, 0x5e, 0xbf,
+	0x7d, 0x77, 0x67, 0xcf, 0xb8, 0xdb, 0x43, 0xb1, 0xd4, 0x4a, 0xf4, 0x29, 0xd3, 0x30, 0x8b, 0x92,
+	0x93, 0xc0, 0xef, 0xb1, 0x7e, 0x47, 0x1a, 0x28, 0x9e, 0x42, 0x6b, 0x14, 0x9d, 0x24, 0x6a, 0x8a,
+	0x5b, 0xdf, 0x02, 0xef, 0x59, 0x8a, 0xdb, 0xb2, 0x7e, 0xfb, 0xee, 0xb6, 0x75, 0x25, 0xd3, 0x85,
+	0x44, 0x0d, 0x1a, 0x1c, 0xa9, 0x93, 0xa0, 0xb6, 0xd1, 0xe0, 0x48, 0x9d, 0x88, 0x07, 0xb0, 0x23,
+	0xd3, 0xc5, 0x70, 0xaa, 0x92, 0x22, 0xfa, 0x3a, 0x52, 0x19, 0x05, 0x2d, 0xd3, 0x85, 0xe1, 0x42,
+	0xeb, 0x25, 0x91, 0x9a, 0x25, 0x22, 0x3e, 0x06, 0xff, 0x59, 0x18, 0x65, 0x7c, 0x07, 0x6a, 0xc3,
+	0x01, 0x85, 0xe0, 0xcb, 0xda, 0x70, 0xc0, 0xaf, 0x82, 0xf7, 0x44, 0x9d, 0x06, 0x5e, 0x8f, 0xf5,
+	0x5b, 0x12, 0x97, 0xbc, 0x0b, 0xf5, 0x47, 0x69, 0x99, 0x14, 0x14, 0x86, 0x2f, 0x35, 0x10, 0x87,
+	0xd0, 0xc2, 0xef, 0x1f, 0x47, 0x2a, 0x9e, 0x72, 0xa1, 0x9d, 0x55, 0x4c, 0x9c, 0xa4, 0xa0, 0x54,
+	0xea, 0x8d, 0xba, 0x50, 0x27, 0x63, 0x72, 0xd3, 0x92, 0x1a, 0x88, 0xcf, 0x01, 0x50, 0x9b, 0x6b,
+	0x3f, 0xb7, 0xa1, 0x4e, 0x88, 0xa2, 0x3f, 0xef, 0x48, 0x2b, 0x2f, 0xf0, 0xf4, 0x0e, 0xd4, 0x87,
+	0x49, 0x71, 0xff, 0x1e, 0xaa, 0xc7, 0x61, 0x5c, 0x2a, 0x8a, 0xc6, 0x93, 0x1a, 0x88, 0x12, 0x9a,
+	0x64, 0x87, 0x79, 0x5f, 0x3a, 0x60, 0x8e, 0x03, 0x94, 0x62, 0x2e, 0x07, 0x86, 0x27, 0x01, 0x7e,
+	0x03, 0xb6, 0x64, 0xba, 0xb0, 0x29, 0xa9, 0x10, 0x7f, 0xd7, 0xec, 0xe2, 0x13, 0xe7, 0x2b, 0x36,
+	0x54, 0x8a, 0xc2, 0x6c, 0xfb, 0x15, 0xc0, 0x67, 0x59, 0x5a, 0xce, 0x29, 0x69, 0xbc, 0x0f, 0x75,
+	0x42, 0x15, 0x3f, 0x6e, 0x3f, 0x32, 0xb1, 0x49, 0x6d, 0xb0, 0x39, 0xe9, 0x78, 0x38, 0xa3, 0x72,
+	0x46, 0x91, 0x78, 0x12, 0x97, 0xe2, 0x7b, 0x06, 0xcd, 0x71, 0x18, 0x2f, 0xd5, 0xe3, 0x30, 0xae,
+	0x78, 0xe3, 0x72, 0xd5, 0x8d, 0x67, 0xdc, 0xbc, 0x0d, 0xcd, 0xc7, 0x71, 0x1a, 0x16, 0x68, 0x8c,
+	0xbe, 0x98, 0x5c, 0x62, 0xbe, 0x0f, 0x30, 0x50, 0x93, 0x68, 0x16, 0xc6, 0xa8, 0xd5, 0xe4, 0xde,
+	0xb4, 0x71, 0x56, 0x3a, 0xe9, 0x18, 0x89, 0x8f, 0xa0, 0x51, 0xa1, 0xcd, 0xb9, 0x47, 0xe9, 0x68,
+	0x12, 0xc6, 0xca, 0x44, 0x41, 0x40, 0x7c, 0x09, 0xdb, 0xfa, 0xa6, 0xe1, 0x9d, 0x19, 0xa9, 0xe2,
+	0x15, 0x4a, 0xf1, 0x95, 0x6e, 0x9f, 0xf8, 0x85, 0x81, 0x8f, 0x2b, 0xe3, 0x80, 0x59, 0x07, 0x1c,
+	0xfc, 0xe7, 0xa7, 0x73, 0x55, 0x65, 0x95, 0xd6, 0xbc, 0x07, 0xed, 0x51, 0x81, 0x97, 0x53, 0x47,
+	0xae, 0xb7, 0x73, 0x45, 0x98, 0xaf, 0x61, 0x52, 0xd8, 0xe3, 0xf6, 0xe4, 0x12, 0xf3, 0x9b, 0xd0,
+	0x3a, 0x48, 0xd3, 0x58, 0x2b, 0xeb, 0x3d, 0xd6, 0x6f, 0x4a, 0x2b, 0xe0, 0xbb, 0x00, 0x26, 0xb3,
+	0xa5, 0x0a, 0xb6, 0x28, 0xd7, 0x8e, 0x44, 0xdc, 0x81, 0x06, 0x46, 0xfa, 0x34, 0x9c, 0x5b, 0x6e,
+	0xec, 0x32, 0x6e, 0xff, 0x30, 0xe8, 0x7c, 0x51, 0xaa, 0xec, 0x54, 0xaa, 0x6f, 0x4b, 0x95, 0x17,
+	0x98, 0x5b, 0xc2, 0xa6, 0x96, 0x09, 0x60, 0xd5, 0x8e, 0x5e, 0x84, 0xd9, 0x54, 0x67, 0xca, 0x97,
+	0x15, 0x42, 0xae, 0x36, 0xe7, 0x39, 0x71, 0x6d, 0x4a, 0x57, 0x44, 0xf5, 0xae, 0x66, 0x69, 0x61,
+	0xc8, 0x54, 0x88, 0xf7, 0xe1, 0xca, 0xe1, 0xcb, 0x49, 0x5c, 0x4e, 0x95, 0x4c, 0x17, 0xfa, 0xeb,
+	0x2d, 0x32, 0x58, 0x17, 0xf3, 0xf7, 0x60, 0xa7, 0x12, 0x99, 0xbe, 0xda, 0x20, 0xc3, 0x35, 0x29,
+	0xdf, 0x87, 0xce, 0xe1, 0xec, 0x58, 0x4d, 0xa7, 0x6a, 0x3a, 0x08, 0x8b, 0x30, 0x68, 0x12, 0xef,
+	0xb5, 0x2e, 0xb7, 0x62, 0x22, 0x7e, 0x60, 0xb0, 0x5d, 0xb1, 0xcf, 0xe7, 0x69, 0x92, 0x2b, 0x3c,
+	0xe2, 0xc3, 0x2c, 0x33, 0x47, 0x7c, 0x98, 0x65, 0xfc, 0x0e, 0x34, 0xa4, 0xca, 0xcb, 0xb8, 0x30,
+	0x55, 0x72, 0xdd, 0x7a, 0x34, 0xdf, 0x96, 0x71, 0x21, 0x8d, 0x15, 0xff, 0x04, 0x76, 0x56, 0xea,
+	0x50, 0x37, 0xfc, 0xf6, 0xdd, 0xb7, 0xec, 0x77, 0x2b, 0x7a, 0xb9, 0x66, 0x2e, 0xfe, 0xf2, 0xa0,
+	0xed, 0x78, 0x5e, 0x16, 0x19, 0xe6, 0x67, 0xbb, 0x2a, 0xb2, 0x5b, 0x34, 0x6c, 0x2e, 0x68, 0xf5,
+	0xd8, 0x93, 0x3a, 0xc0, 0x8e, 0xaa, 0xb2, 0x64, 0x47, 0xb6, 0x11, 0x7a, 0x97, 0x35, 0x42, 0x1c,
+	0x5d, 0x2f, 0xc2, 0xe4, 0x44, 0x4d, 0xa9, 0x2c, 0x9b, 0xd2, 0x40, 0xbe, 0x67, 0xbb, 0x02, 0x9d,
+	0xe3, 0x4a, 0xaf, 0x31, 0x1a, 0x69, 0x3b, 0x87, 0xee, 0x72, 0xc3, 0x01, 0x9e, 0x15, 0xd5, 0x8b,
+	0x46, 0xfc, 0x3e, 0xb4, 0x6d, 0xfb, 0xca, 0xab, 0x23, 0xea, 0x5a, 0x57, 0x56, 0x29, 0x5d, 0x43,
+	0xfe, 0xe9, 0xfa, 0x5c, 0x0a, 0x5a, 0x14, 0x45, 0xb0, 0xc2, 0xdc, 0xd1, 0xcb, 0xf5, 0x39, 0xb6,
+	0xef, 0x0c, 0xca, 0x00, 0xe8, 0xe3, 0x6b, 0xf6, 0xe3, 0xa5, 0x4a, 0x3a, 0xe3, 0xf4, 0x9e, 0x3b,
+	0x4b, 0x82, 0x36, 0x7d, 0xd3, 0x5d, 0xcd, 0x9c, 0xd6, 0x49, 0x77, 0xe6, 0xec, 0x3b, 0x83, 0x2c,
+	0xe8, 0xac, 0x6f, 0xb4, 0x54, 0x49, 0x6b, 0x25, 0xfe, 0x60, 0xb0, 0x3d, 0x9c, 0xcd, 0xd3, 0xac,
+	0x70, 0x6e, 0xe1, 0x30, 0x99, 0xaa, 0x97, 0xe6, 0x16, 0x12, 0xd8, 0x3c, 0xa8, 0xa8, 0x1b, 0xe2,
+	0x6d, 0xa4, 0xdb, 0xe7, 0x4b, 0x0d, 0x9c, 0x13, 0xf0, 0x57, 0x4e, 0xe0, 0x26, 0xb4, 0x74, 0xb9,
+	0xa1, 0xaa, 0x4e, 0x2a, 0x2b, 0xd0, 0x0f, 0x8d, 0x05, 0x0d, 0xf7, 0x06, 0x0d, 0x77, 0x03, 0xb1,
+	0xf3, 0x68, 0x33, 0x52, 0x36, 0x49, 0xe9, 0x48, 0x50, 0xff, 0x3c, 0x9a, 0xa9, 0xbc, 0x08, 0x67,
+	0x73, 0xbc, 0xca, 0x5e, 0xdf, 0x93, 0x8e, 0x44, 0xfc, 0xcd, 0x80, 0x6b, 0x8e, 0xd4, 0xa9, 0xfe,
+	0x3f, 0xa2, 0x97, 0x13, 0x5a, 0x0d, 0xbb, 0x71, 0x2e, 0xec, 0x1b, 0xb0, 0x45, 0xf1, 0x98, 0x90,
+	0x2b, 0x84, 0x8d, 0xcd, 0xb6, 0x55, 0xcd, 0x97, 0x49, 0x57, 0xc4, 0x05, 0x74, 0x9c, 0x9e, 0x8e,
+	0x05, 0x89, 0xbe, 0x57, 0x64, 0x62, 0x0c, 0xdd, 0xe7, 0x59, 0x98, 0xe4, 0x71, 0x58, 0x28, 0xdc,
+	0xee, 0x75, 0x58, 0x6f, 0x78, 0x35, 0x8a, 0xf7, 0xe1, 0xfa, 0x9a, 0x5f, 0xdb, 0xbe, 0x30, 0x0d,
+	0x1e, 0xa5, 0x01, 0x97, 0x62, 0x04, 0xd7, 0x96, 0xa6, 0xc3, 0xc1, 0x6b, 0x45, 0x70, 0xde, 0xe9,
+	0x07, 0x0e, 0x2f, 0x72, 0x5a, 0x6d, 0xbf, 0x29, 0xd6, 0x03, 0x08, 0xaa, 0xda, 0xd6, 0x4f, 0xd6,
+	0x2a, 0x82, 0x71, 0xa4, 0x16, 0x68, 0x7f, 0x14, 0xce, 0x54, 0x15, 0x04, 0xad, 0x51, 0x46, 0xed,
+	0xbb, 0x46, 0x0f, 0x5d, 0x5a, 0x8b, 0x1f, 0x19, 0x74, 0x37, 0x39, 0xa1, 0xf7, 0x48, 0xac, 0x42,
+	0xdd, 0xb0, 0x9b, 0x52, 0x03, 0xfe, 0x00, 0xea, 0xdf, 0x45, 0x6a, 0x61, 0x1a, 0xb6, 0x70, 0xde,
+	0x52, 0x17, 0x44, 0x22, 0xf5, 0x07, 0x58, 0x0e, 0x0f, 0x27, 0x45, 0x94, 0x26, 0xe6, 0x75, 0xa6,
+	0x11, 0xee, 0x73, 0x10, 0xa7, 0x93, 0x6f, 0xa8, 0x2f, 0xfa, 0x52, 0x03, 0xf1, 0x33, 0x33, 0xdc,
+	0x9c, 0x89, 0xf7, 0x9f, 0x19, 0xd6, 0x35, 0x6c, 0x9e, 0x2e, 0x54, 0xc3, 0x81, 0x1e, 0xdb, 0xf6,
+	0x75, 0x62, 0x20, 0x3e, 0x15, 0x70, 0x39, 0x0e, 0x63, 0x7d, 0x91, 0x5b, 0x72, 0x89, 0x2f, 0xaf,
+	0xfc, 0x83, 0xab, 0xbf, 0x9e, 0xed, 0xb2, 0xdf, 0xce, 0x76, 0xd9, 0xef, 0x67, 0xbb, 0xec, 0xa7,
+	0x3f, 0x77, 0xdf, 0x38, 0xde, 0xa2, 0x3f, 0x96, 0x0f, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xfc,
+	0x97, 0x67, 0xec, 0xc1, 0x0c, 0x00, 0x00,
 }
 
 func (m *Row) Marshal() (dAtA []byte, err error) {
@@ -2811,6 +2820,18 @@ func (m *QueryResult) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
+	if m.PairField != nil {
+		{
+			size, err := m.PairField.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintPublic(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x62
+	}
 	if m.PairsField != nil {
 		{
 			size, err := m.PairsField.MarshalToSizedBuffer(dAtA[:i])
@@ -2862,20 +2883,20 @@ func (m *QueryResult) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		}
 	}
 	if len(m.RowIDs) > 0 {
-		dAtA16 := make([]byte, len(m.RowIDs)*10)
-		var j15 int
+		dAtA17 := make([]byte, len(m.RowIDs)*10)
+		var j16 int
 		for _, num := range m.RowIDs {
 			for num >= 1<<7 {
-				dAtA16[j15] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA17[j16] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j15++
+				j16++
 			}
-			dAtA16[j15] = uint8(num)
-			j15++
+			dAtA17[j16] = uint8(num)
+			j16++
 		}
-		i -= j15
-		copy(dAtA[i:], dAtA16[:j15])
-		i = encodeVarintPublic(dAtA, i, uint64(j15))
+		i -= j16
+		copy(dAtA[i:], dAtA17[:j16])
+		i = encodeVarintPublic(dAtA, i, uint64(j16))
 		i--
 		dAtA[i] = 0x3a
 	}
@@ -2983,57 +3004,57 @@ func (m *ImportRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		}
 	}
 	if len(m.Timestamps) > 0 {
-		dAtA20 := make([]byte, len(m.Timestamps)*10)
-		var j19 int
+		dAtA21 := make([]byte, len(m.Timestamps)*10)
+		var j20 int
 		for _, num1 := range m.Timestamps {
 			num := uint64(num1)
 			for num >= 1<<7 {
-				dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA21[j20] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j19++
+				j20++
 			}
-			dAtA20[j19] = uint8(num)
-			j19++
+			dAtA21[j20] = uint8(num)
+			j20++
 		}
-		i -= j19
-		copy(dAtA[i:], dAtA20[:j19])
-		i = encodeVarintPublic(dAtA, i, uint64(j19))
+		i -= j20
+		copy(dAtA[i:], dAtA21[:j20])
+		i = encodeVarintPublic(dAtA, i, uint64(j20))
 		i--
 		dAtA[i] = 0x32
 	}
 	if len(m.ColumnIDs) > 0 {
-		dAtA22 := make([]byte, len(m.ColumnIDs)*10)
-		var j21 int
+		dAtA23 := make([]byte, len(m.ColumnIDs)*10)
+		var j22 int
 		for _, num := range m.ColumnIDs {
 			for num >= 1<<7 {
-				dAtA22[j21] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA23[j22] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j21++
+				j22++
 			}
-			dAtA22[j21] = uint8(num)
-			j21++
+			dAtA23[j22] = uint8(num)
+			j22++
 		}
-		i -= j21
-		copy(dAtA[i:], dAtA22[:j21])
-		i = encodeVarintPublic(dAtA, i, uint64(j21))
+		i -= j22
+		copy(dAtA[i:], dAtA23[:j22])
+		i = encodeVarintPublic(dAtA, i, uint64(j22))
 		i--
 		dAtA[i] = 0x2a
 	}
 	if len(m.RowIDs) > 0 {
-		dAtA24 := make([]byte, len(m.RowIDs)*10)
-		var j23 int
+		dAtA25 := make([]byte, len(m.RowIDs)*10)
+		var j24 int
 		for _, num := range m.RowIDs {
 			for num >= 1<<7 {
-				dAtA24[j23] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA25[j24] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j23++
+				j24++
 			}
-			dAtA24[j23] = uint8(num)
-			j23++
+			dAtA25[j24] = uint8(num)
+			j24++
 		}
-		i -= j23
-		copy(dAtA[i:], dAtA24[:j23])
-		i = encodeVarintPublic(dAtA, i, uint64(j23))
+		i -= j24
+		copy(dAtA[i:], dAtA25[:j24])
+		i = encodeVarintPublic(dAtA, i, uint64(j24))
 		i--
 		dAtA[i] = 0x22
 	}
@@ -3094,9 +3115,9 @@ func (m *ImportValueRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	}
 	if len(m.FloatValues) > 0 {
 		for iNdEx := len(m.FloatValues) - 1; iNdEx >= 0; iNdEx-- {
-			f25 := math.Float64bits(float64(m.FloatValues[iNdEx]))
+			f26 := math.Float64bits(float64(m.FloatValues[iNdEx]))
 			i -= 8
-			encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f25))
+			encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f26))
 		}
 		i = encodeVarintPublic(dAtA, i, uint64(len(m.FloatValues)*8))
 		i--
@@ -3112,39 +3133,39 @@ func (m *ImportValueRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		}
 	}
 	if len(m.Values) > 0 {
-		dAtA27 := make([]byte, len(m.Values)*10)
-		var j26 int
+		dAtA28 := make([]byte, len(m.Values)*10)
+		var j27 int
 		for _, num1 := range m.Values {
 			num := uint64(num1)
 			for num >= 1<<7 {
-				dAtA27[j26] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA28[j27] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j26++
+				j27++
 			}
-			dAtA27[j26] = uint8(num)
-			j26++
+			dAtA28[j27] = uint8(num)
+			j27++
 		}
-		i -= j26
-		copy(dAtA[i:], dAtA27[:j26])
-		i = encodeVarintPublic(dAtA, i, uint64(j26))
+		i -= j27
+		copy(dAtA[i:], dAtA28[:j27])
+		i = encodeVarintPublic(dAtA, i, uint64(j27))
 		i--
 		dAtA[i] = 0x32
 	}
 	if len(m.ColumnIDs) > 0 {
-		dAtA29 := make([]byte, len(m.ColumnIDs)*10)
-		var j28 int
+		dAtA30 := make([]byte, len(m.ColumnIDs)*10)
+		var j29 int
 		for _, num := range m.ColumnIDs {
 			for num >= 1<<7 {
-				dAtA29[j28] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA30[j29] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j28++
+				j29++
 			}
-			dAtA29[j28] = uint8(num)
-			j28++
+			dAtA30[j29] = uint8(num)
+			j29++
 		}
-		i -= j28
-		copy(dAtA[i:], dAtA29[:j28])
-		i = encodeVarintPublic(dAtA, i, uint64(j28))
+		i -= j29
+		copy(dAtA[i:], dAtA30[:j29])
+		i = encodeVarintPublic(dAtA, i, uint64(j29))
 		i--
 		dAtA[i] = 0x2a
 	}
@@ -3245,20 +3266,20 @@ func (m *TranslateKeysResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
 	if len(m.IDs) > 0 {
-		dAtA31 := make([]byte, len(m.IDs)*10)
-		var j30 int
+		dAtA32 := make([]byte, len(m.IDs)*10)
+		var j31 int
 		for _, num := range m.IDs {
 			for num >= 1<<7 {
-				dAtA31[j30] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA32[j31] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j30++
+				j31++
 			}
-			dAtA31[j30] = uint8(num)
-			j30++
+			dAtA32[j31] = uint8(num)
+			j31++
 		}
-		i -= j30
-		copy(dAtA[i:], dAtA31[:j30])
-		i = encodeVarintPublic(dAtA, i, uint64(j30))
+		i -= j31
+		copy(dAtA[i:], dAtA32[:j31])
+		i = encodeVarintPublic(dAtA, i, uint64(j31))
 		i--
 		dAtA[i] = 0x1a
 	}
@@ -3290,20 +3311,20 @@ func (m *TranslateIDsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
 	if len(m.IDs) > 0 {
-		dAtA33 := make([]byte, len(m.IDs)*10)
-		var j32 int
+		dAtA34 := make([]byte, len(m.IDs)*10)
+		var j33 int
 		for _, num := range m.IDs {
 			for num >= 1<<7 {
-				dAtA33[j32] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA34[j33] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j32++
+				j33++
 			}
-			dAtA33[j32] = uint8(num)
-			j32++
+			dAtA34[j33] = uint8(num)
+			j33++
 		}
-		i -= j32
-		copy(dAtA[i:], dAtA33[:j32])
-		i = encodeVarintPublic(dAtA, i, uint64(j32))
+		i -= j33
+		copy(dAtA[i:], dAtA34[:j33])
+		i = encodeVarintPublic(dAtA, i, uint64(j33))
 		i--
 		dAtA[i] = 0x1a
 	}
@@ -3489,20 +3510,20 @@ func (m *ImportColumnAttrsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
 	if len(m.ColumnIDs) > 0 {
-		dAtA35 := make([]byte, len(m.ColumnIDs)*10)
-		var j34 int
+		dAtA36 := make([]byte, len(m.ColumnIDs)*10)
+		var j35 int
 		for _, num := range m.ColumnIDs {
 			for num >= 1<<7 {
-				dAtA35[j34] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA36[j35] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j34++
+				j35++
 			}
-			dAtA35[j34] = uint8(num)
-			j34++
+			dAtA36[j35] = uint8(num)
+			j35++
 		}
-		i -= j34
-		copy(dAtA[i:], dAtA35[:j34])
-		i = encodeVarintPublic(dAtA, i, uint64(j34))
+		i -= j35
+		copy(dAtA[i:], dAtA36[:j35])
+		i = encodeVarintPublic(dAtA, i, uint64(j35))
 		i--
 		dAtA[i] = 0x2a
 	}
@@ -3999,6 +4020,10 @@ func (m *QueryResult) Size() (n int) {
 		l = m.PairsField.Size()
 		n += 1 + l + sovPublic(uint64(l))
 	}
+	if m.PairField != nil {
+		l = m.PairField.Size()
+		n += 1 + l + sovPublic(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -7035,6 +7060,42 @@ func (m *QueryResult) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 12:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PairField", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowPublic
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthPublic
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthPublic
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.PairField == nil {
+				m.PairField = &PairField{}
+			}
+			if err := m.PairField.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipPublic(dAtA[iNdEx:])
diff --git a/internal/public.proto b/internal/public.proto
index 902d27efc..81220fbfe 100644
--- a/internal/public.proto
+++ b/internal/public.proto
@@ -111,6 +111,7 @@ message QueryResult {
 	RowIdentifiers RowIdentifiers = 9;
 	SignedRow SignedRow = 10;
 	PairsField PairsField = 11;
+	PairField PairField = 12;
 }
 
 message ImportRequest {