diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1f4a3b3..dbb19dc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # CHANGELOG
 
-Lib version: 1.15.0-SNAPSHOT-260910094535
+Lib version: 1.15.0-SNAPSHOT-260910095605
diff --git a/lib/clickhouse.pb.dart b/lib/clickhouse.pb.dart
index 85d14aef..5ef378ec 100644
--- a/lib/clickhouse.pb.dart
+++ b/lib/clickhouse.pb.dart
@@ -414,399 +414,6 @@ class CHMetric extends $pb.GeneratedMessage {
   void clearIsComputed() => $_clearField(13);
 }
 
-class SimpleJSONQueryExpression extends $pb.GeneratedMessage {
-  factory SimpleJSONQueryExpression({
-    $core.String? block,
-    CHQueryType? queryType,
-    $core.String? field_3,
-    $core.String? query,
-  }) {
-    final result = create();
-    if (block != null) result.block = block;
-    if (queryType != null) result.queryType = queryType;
-    if (field_3 != null) result.field_3 = field_3;
-    if (query != null) result.query = query;
-    return result;
-  }
-
-  SimpleJSONQueryExpression._();
-
-  factory SimpleJSONQueryExpression.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory SimpleJSONQueryExpression.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SimpleJSONQueryExpression', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'Block', protoName: 'Block')
-    ..e<CHQueryType>(2, _omitFieldNames ? '' : 'QueryType', $pb.PbFieldType.OE, protoName: 'QueryType', defaultOrMaker: CHQueryType.CH_QUERY_TYPE_UNKNOWN, valueOf: CHQueryType.valueOf, enumValues: CHQueryType.values)
-    ..aOS(3, _omitFieldNames ? '' : 'Field', protoName: 'Field')
-    ..aOS(4, _omitFieldNames ? '' : 'Query', protoName: 'Query')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SimpleJSONQueryExpression clone() => SimpleJSONQueryExpression()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SimpleJSONQueryExpression copyWith(void Function(SimpleJSONQueryExpression) updates) => super.copyWith((message) => updates(message as SimpleJSONQueryExpression)) as SimpleJSONQueryExpression;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SimpleJSONQueryExpression create() => SimpleJSONQueryExpression._();
-  @$core.override
-  SimpleJSONQueryExpression createEmptyInstance() => create();
-  static $pb.PbList<SimpleJSONQueryExpression> createRepeated() => $pb.PbList<SimpleJSONQueryExpression>();
-  @$core.pragma('dart2js:noInline')
-  static SimpleJSONQueryExpression getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SimpleJSONQueryExpression>(create);
-  static SimpleJSONQueryExpression? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get block => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set block($core.String value) => $_setString(0, value);
-  @$pb.TagNumber(1)
-  $core.bool hasBlock() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearBlock() => $_clearField(1);
-
-  @$pb.TagNumber(2)
-  CHQueryType get queryType => $_getN(1);
-  @$pb.TagNumber(2)
-  set queryType(CHQueryType value) => $_setField(2, value);
-  @$pb.TagNumber(2)
-  $core.bool hasQueryType() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearQueryType() => $_clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.String get field_3 => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set field_3($core.String value) => $_setString(2, value);
-  @$pb.TagNumber(3)
-  $core.bool hasField_3() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearField_3() => $_clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.String get query => $_getSZ(3);
-  @$pb.TagNumber(4)
-  set query($core.String value) => $_setString(3, value);
-  @$pb.TagNumber(4)
-  $core.bool hasQuery() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearQuery() => $_clearField(4);
-}
-
-class SimpleJSONDimension extends $pb.GeneratedMessage {
-  factory SimpleJSONDimension({
-    $core.String? name,
-    $core.String? granularity,
-    $core.String? level,
-    $core.String? dataType,
-    $core.String? contentType,
-    $core.String? enumValues,
-    $core.String? period,
-    $core.String? operator,
-    $core.Iterable<$core.String>? values,
-    $0.StringDateObject? startDate,
-    $0.StringDateObject? endDate,
-    $core.Iterable<SimpleJSONQueryExpression>? expressions,
-    $core.bool? isComputed,
-    SimpleJSONDimension? or,
-  }) {
-    final result = create();
-    if (name != null) result.name = name;
-    if (granularity != null) result.granularity = granularity;
-    if (level != null) result.level = level;
-    if (dataType != null) result.dataType = dataType;
-    if (contentType != null) result.contentType = contentType;
-    if (enumValues != null) result.enumValues = enumValues;
-    if (period != null) result.period = period;
-    if (operator != null) result.operator = operator;
-    if (values != null) result.values.addAll(values);
-    if (startDate != null) result.startDate = startDate;
-    if (endDate != null) result.endDate = endDate;
-    if (expressions != null) result.expressions.addAll(expressions);
-    if (isComputed != null) result.isComputed = isComputed;
-    if (or != null) result.or = or;
-    return result;
-  }
-
-  SimpleJSONDimension._();
-
-  factory SimpleJSONDimension.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory SimpleJSONDimension.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SimpleJSONDimension', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
-    ..aOS(2, _omitFieldNames ? '' : 'Granularity', protoName: 'Granularity')
-    ..aOS(3, _omitFieldNames ? '' : 'Level', protoName: 'Level')
-    ..aOS(4, _omitFieldNames ? '' : 'DataType', protoName: 'DataType')
-    ..aOS(5, _omitFieldNames ? '' : 'ContentType', protoName: 'ContentType')
-    ..aOS(6, _omitFieldNames ? '' : 'EnumValues', protoName: 'EnumValues')
-    ..aOS(7, _omitFieldNames ? '' : 'Period', protoName: 'Period')
-    ..aOS(8, _omitFieldNames ? '' : 'Operator', protoName: 'Operator')
-    ..pPS(9, _omitFieldNames ? '' : 'Values', protoName: 'Values')
-    ..aOM<$0.StringDateObject>(10, _omitFieldNames ? '' : 'StartDate', protoName: 'StartDate', subBuilder: $0.StringDateObject.create)
-    ..aOM<$0.StringDateObject>(11, _omitFieldNames ? '' : 'EndDate', protoName: 'EndDate', subBuilder: $0.StringDateObject.create)
-    ..pc<SimpleJSONQueryExpression>(12, _omitFieldNames ? '' : 'Expressions', $pb.PbFieldType.PM, protoName: 'Expressions', subBuilder: SimpleJSONQueryExpression.create)
-    ..aOB(13, _omitFieldNames ? '' : 'IsComputed', protoName: 'IsComputed')
-    ..aOM<SimpleJSONDimension>(14, _omitFieldNames ? '' : 'Or', protoName: 'Or', subBuilder: SimpleJSONDimension.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SimpleJSONDimension clone() => SimpleJSONDimension()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SimpleJSONDimension copyWith(void Function(SimpleJSONDimension) updates) => super.copyWith((message) => updates(message as SimpleJSONDimension)) as SimpleJSONDimension;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SimpleJSONDimension create() => SimpleJSONDimension._();
-  @$core.override
-  SimpleJSONDimension createEmptyInstance() => create();
-  static $pb.PbList<SimpleJSONDimension> createRepeated() => $pb.PbList<SimpleJSONDimension>();
-  @$core.pragma('dart2js:noInline')
-  static SimpleJSONDimension getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SimpleJSONDimension>(create);
-  static SimpleJSONDimension? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get name => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set name($core.String value) => $_setString(0, value);
-  @$pb.TagNumber(1)
-  $core.bool hasName() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearName() => $_clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get granularity => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set granularity($core.String value) => $_setString(1, value);
-  @$pb.TagNumber(2)
-  $core.bool hasGranularity() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearGranularity() => $_clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.String get level => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set level($core.String value) => $_setString(2, value);
-  @$pb.TagNumber(3)
-  $core.bool hasLevel() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearLevel() => $_clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.String get dataType => $_getSZ(3);
-  @$pb.TagNumber(4)
-  set dataType($core.String value) => $_setString(3, value);
-  @$pb.TagNumber(4)
-  $core.bool hasDataType() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearDataType() => $_clearField(4);
-
-  @$pb.TagNumber(5)
-  $core.String get contentType => $_getSZ(4);
-  @$pb.TagNumber(5)
-  set contentType($core.String value) => $_setString(4, value);
-  @$pb.TagNumber(5)
-  $core.bool hasContentType() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearContentType() => $_clearField(5);
-
-  @$pb.TagNumber(6)
-  $core.String get enumValues => $_getSZ(5);
-  @$pb.TagNumber(6)
-  set enumValues($core.String value) => $_setString(5, value);
-  @$pb.TagNumber(6)
-  $core.bool hasEnumValues() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearEnumValues() => $_clearField(6);
-
-  /// A period of time
-  @$pb.TagNumber(7)
-  $core.String get period => $_getSZ(6);
-  @$pb.TagNumber(7)
-  set period($core.String value) => $_setString(6, value);
-  @$pb.TagNumber(7)
-  $core.bool hasPeriod() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearPeriod() => $_clearField(7);
-
-  /// Allowed values : "", "EQUAL", "DIFF", "START_BY", "NOT_START_BY", "FINISH_BY", "NOT_FINISH_BY", "CONTAINS", "NOT_CONTAINS", "IN_LIST", "NOT_IN_LIST"
-  @$pb.TagNumber(8)
-  $core.String get operator => $_getSZ(7);
-  @$pb.TagNumber(8)
-  set operator($core.String value) => $_setString(7, value);
-  @$pb.TagNumber(8)
-  $core.bool hasOperator() => $_has(7);
-  @$pb.TagNumber(8)
-  void clearOperator() => $_clearField(8);
-
-  @$pb.TagNumber(9)
-  $pb.PbList<$core.String> get values => $_getList(8);
-
-  @$pb.TagNumber(10)
-  $0.StringDateObject get startDate => $_getN(9);
-  @$pb.TagNumber(10)
-  set startDate($0.StringDateObject value) => $_setField(10, value);
-  @$pb.TagNumber(10)
-  $core.bool hasStartDate() => $_has(9);
-  @$pb.TagNumber(10)
-  void clearStartDate() => $_clearField(10);
-  @$pb.TagNumber(10)
-  $0.StringDateObject ensureStartDate() => $_ensure(9);
-
-  @$pb.TagNumber(11)
-  $0.StringDateObject get endDate => $_getN(10);
-  @$pb.TagNumber(11)
-  set endDate($0.StringDateObject value) => $_setField(11, value);
-  @$pb.TagNumber(11)
-  $core.bool hasEndDate() => $_has(10);
-  @$pb.TagNumber(11)
-  void clearEndDate() => $_clearField(11);
-  @$pb.TagNumber(11)
-  $0.StringDateObject ensureEndDate() => $_ensure(10);
-
-  @$pb.TagNumber(12)
-  $pb.PbList<SimpleJSONQueryExpression> get expressions => $_getList(11);
-
-  @$pb.TagNumber(13)
-  $core.bool get isComputed => $_getBF(12);
-  @$pb.TagNumber(13)
-  set isComputed($core.bool value) => $_setBool(12, value);
-  @$pb.TagNumber(13)
-  $core.bool hasIsComputed() => $_has(12);
-  @$pb.TagNumber(13)
-  void clearIsComputed() => $_clearField(13);
-
-  /// Only useful for filters
-  @$pb.TagNumber(14)
-  SimpleJSONDimension get or => $_getN(13);
-  @$pb.TagNumber(14)
-  set or(SimpleJSONDimension value) => $_setField(14, value);
-  @$pb.TagNumber(14)
-  $core.bool hasOr() => $_has(13);
-  @$pb.TagNumber(14)
-  void clearOr() => $_clearField(14);
-  @$pb.TagNumber(14)
-  SimpleJSONDimension ensureOr() => $_ensure(13);
-}
-
-class SimpleJSONMetric extends $pb.GeneratedMessage {
-  factory SimpleJSONMetric({
-    $core.String? name,
-    $core.String? level,
-    $core.String? dataType,
-    $core.String? contentType,
-    $core.String? enumValues,
-    $core.Iterable<SimpleJSONQueryExpression>? expressions,
-    $core.bool? isComputed,
-  }) {
-    final result = create();
-    if (name != null) result.name = name;
-    if (level != null) result.level = level;
-    if (dataType != null) result.dataType = dataType;
-    if (contentType != null) result.contentType = contentType;
-    if (enumValues != null) result.enumValues = enumValues;
-    if (expressions != null) result.expressions.addAll(expressions);
-    if (isComputed != null) result.isComputed = isComputed;
-    return result;
-  }
-
-  SimpleJSONMetric._();
-
-  factory SimpleJSONMetric.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory SimpleJSONMetric.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SimpleJSONMetric', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
-    ..aOS(3, _omitFieldNames ? '' : 'Level', protoName: 'Level')
-    ..aOS(4, _omitFieldNames ? '' : 'DataType', protoName: 'DataType')
-    ..aOS(5, _omitFieldNames ? '' : 'ContentType', protoName: 'ContentType')
-    ..aOS(6, _omitFieldNames ? '' : 'EnumValues', protoName: 'EnumValues')
-    ..pc<SimpleJSONQueryExpression>(12, _omitFieldNames ? '' : 'Expressions', $pb.PbFieldType.PM, protoName: 'Expressions', subBuilder: SimpleJSONQueryExpression.create)
-    ..aOB(13, _omitFieldNames ? '' : 'IsComputed', protoName: 'IsComputed')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SimpleJSONMetric clone() => SimpleJSONMetric()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SimpleJSONMetric copyWith(void Function(SimpleJSONMetric) updates) => super.copyWith((message) => updates(message as SimpleJSONMetric)) as SimpleJSONMetric;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SimpleJSONMetric create() => SimpleJSONMetric._();
-  @$core.override
-  SimpleJSONMetric createEmptyInstance() => create();
-  static $pb.PbList<SimpleJSONMetric> createRepeated() => $pb.PbList<SimpleJSONMetric>();
-  @$core.pragma('dart2js:noInline')
-  static SimpleJSONMetric getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SimpleJSONMetric>(create);
-  static SimpleJSONMetric? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get name => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set name($core.String value) => $_setString(0, value);
-  @$pb.TagNumber(1)
-  $core.bool hasName() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearName() => $_clearField(1);
-
-  @$pb.TagNumber(3)
-  $core.String get level => $_getSZ(1);
-  @$pb.TagNumber(3)
-  set level($core.String value) => $_setString(1, value);
-  @$pb.TagNumber(3)
-  $core.bool hasLevel() => $_has(1);
-  @$pb.TagNumber(3)
-  void clearLevel() => $_clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.String get dataType => $_getSZ(2);
-  @$pb.TagNumber(4)
-  set dataType($core.String value) => $_setString(2, value);
-  @$pb.TagNumber(4)
-  $core.bool hasDataType() => $_has(2);
-  @$pb.TagNumber(4)
-  void clearDataType() => $_clearField(4);
-
-  @$pb.TagNumber(5)
-  $core.String get contentType => $_getSZ(3);
-  @$pb.TagNumber(5)
-  set contentType($core.String value) => $_setString(3, value);
-  @$pb.TagNumber(5)
-  $core.bool hasContentType() => $_has(3);
-  @$pb.TagNumber(5)
-  void clearContentType() => $_clearField(5);
-
-  @$pb.TagNumber(6)
-  $core.String get enumValues => $_getSZ(4);
-  @$pb.TagNumber(6)
-  set enumValues($core.String value) => $_setString(4, value);
-  @$pb.TagNumber(6)
-  $core.bool hasEnumValues() => $_has(4);
-  @$pb.TagNumber(6)
-  void clearEnumValues() => $_clearField(6);
-
-  @$pb.TagNumber(12)
-  $pb.PbList<SimpleJSONQueryExpression> get expressions => $_getList(5);
-
-  @$pb.TagNumber(13)
-  $core.bool get isComputed => $_getBF(6);
-  @$pb.TagNumber(13)
-  set isComputed($core.bool value) => $_setBool(6, value);
-  @$pb.TagNumber(13)
-  $core.bool hasIsComputed() => $_has(6);
-  @$pb.TagNumber(13)
-  void clearIsComputed() => $_clearField(13);
-}
-
 class CHFilter extends $pb.GeneratedMessage {
   factory CHFilter({
     $core.Iterable<CHDimension>? dimensions,
@@ -847,46 +454,6 @@ class CHFilter extends $pb.GeneratedMessage {
   $pb.PbList<CHDimension> get dimensions => $_getList(0);
 }
 
-class SimpleJSONFilter extends $pb.GeneratedMessage {
-  factory SimpleJSONFilter({
-    $core.Iterable<SimpleJSONDimension>? dimensions,
-  }) {
-    final result = create();
-    if (dimensions != null) result.dimensions.addAll(dimensions);
-    return result;
-  }
-
-  SimpleJSONFilter._();
-
-  factory SimpleJSONFilter.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory SimpleJSONFilter.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SimpleJSONFilter', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<SimpleJSONDimension>(1, _omitFieldNames ? '' : 'Dimensions', $pb.PbFieldType.PM, protoName: 'Dimensions', subBuilder: SimpleJSONDimension.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SimpleJSONFilter clone() => SimpleJSONFilter()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SimpleJSONFilter copyWith(void Function(SimpleJSONFilter) updates) => super.copyWith((message) => updates(message as SimpleJSONFilter)) as SimpleJSONFilter;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SimpleJSONFilter create() => SimpleJSONFilter._();
-  @$core.override
-  SimpleJSONFilter createEmptyInstance() => create();
-  static $pb.PbList<SimpleJSONFilter> createRepeated() => $pb.PbList<SimpleJSONFilter>();
-  @$core.pragma('dart2js:noInline')
-  static SimpleJSONFilter getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SimpleJSONFilter>(create);
-  static SimpleJSONFilter? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $pb.PbList<SimpleJSONDimension> get dimensions => $_getList(0);
-}
-
 class KpiDataSerie extends $pb.GeneratedMessage {
   factory KpiDataSerie({
     $core.String? name,
@@ -1325,9 +892,7 @@ class GetKPIDataResult extends $pb.GeneratedMessage {
 class GetKPIDataSimpleJSONQuery extends $pb.GeneratedMessage {
   factory GetKPIDataSimpleJSONQuery({
     $0.QueryProjectHeader? header,
-    CHQueryType? queryType,
-    $core.String? queryBlock,
-    SimpleJSONFilter? filter,
+    $core.Iterable<SimpleJSONFilter>? filters,
     $core.Iterable<SimpleJSONDimension>? dimensions,
     $core.Iterable<SimpleJSONMetric>? metrics,
     $core.String? targetTimeZone,
@@ -1337,9 +902,7 @@ class GetKPIDataSimpleJSONQuery extends $pb.GeneratedMessage {
   }) {
     final result = create();
     if (header != null) result.header = header;
-    if (queryType != null) result.queryType = queryType;
-    if (queryBlock != null) result.queryBlock = queryBlock;
-    if (filter != null) result.filter = filter;
+    if (filters != null) result.filters.addAll(filters);
     if (dimensions != null) result.dimensions.addAll(dimensions);
     if (metrics != null) result.metrics.addAll(metrics);
     if (targetTimeZone != null) result.targetTimeZone = targetTimeZone;
@@ -1356,9 +919,7 @@ class GetKPIDataSimpleJSONQuery extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetKPIDataSimpleJSONQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$0.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $0.QueryProjectHeader.create)
-    ..e<CHQueryType>(2, _omitFieldNames ? '' : 'QueryType', $pb.PbFieldType.OE, protoName: 'QueryType', defaultOrMaker: CHQueryType.CH_QUERY_TYPE_UNKNOWN, valueOf: CHQueryType.valueOf, enumValues: CHQueryType.values)
-    ..aOS(3, _omitFieldNames ? '' : 'QueryBlock', protoName: 'QueryBlock')
-    ..aOM<SimpleJSONFilter>(4, _omitFieldNames ? '' : 'Filter', protoName: 'Filter', subBuilder: SimpleJSONFilter.create)
+    ..pc<SimpleJSONFilter>(4, _omitFieldNames ? '' : 'Filters', $pb.PbFieldType.PM, protoName: 'Filters', subBuilder: SimpleJSONFilter.create)
     ..pc<SimpleJSONDimension>(5, _omitFieldNames ? '' : 'Dimensions', $pb.PbFieldType.PM, protoName: 'Dimensions', subBuilder: SimpleJSONDimension.create)
     ..pc<SimpleJSONMetric>(6, _omitFieldNames ? '' : 'Metrics', $pb.PbFieldType.PM, protoName: 'Metrics', subBuilder: SimpleJSONMetric.create)
     ..aOS(7, _omitFieldNames ? '' : 'TargetTimeZone', protoName: 'TargetTimeZone')
@@ -1396,56 +957,32 @@ class GetKPIDataSimpleJSONQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $0.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  @$pb.TagNumber(2)
-  CHQueryType get queryType => $_getN(1);
-  @$pb.TagNumber(2)
-  set queryType(CHQueryType value) => $_setField(2, value);
-  @$pb.TagNumber(2)
-  $core.bool hasQueryType() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearQueryType() => $_clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.String get queryBlock => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set queryBlock($core.String value) => $_setString(2, value);
-  @$pb.TagNumber(3)
-  $core.bool hasQueryBlock() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearQueryBlock() => $_clearField(3);
-
+  /// CHQueryType QueryType = 2;
+  /// string QueryBlock = 3;
   @$pb.TagNumber(4)
-  SimpleJSONFilter get filter => $_getN(3);
-  @$pb.TagNumber(4)
-  set filter(SimpleJSONFilter value) => $_setField(4, value);
-  @$pb.TagNumber(4)
-  $core.bool hasFilter() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearFilter() => $_clearField(4);
-  @$pb.TagNumber(4)
-  SimpleJSONFilter ensureFilter() => $_ensure(3);
+  $pb.PbList<SimpleJSONFilter> get filters => $_getList(1);
 
   @$pb.TagNumber(5)
-  $pb.PbList<SimpleJSONDimension> get dimensions => $_getList(4);
+  $pb.PbList<SimpleJSONDimension> get dimensions => $_getList(2);
 
   @$pb.TagNumber(6)
-  $pb.PbList<SimpleJSONMetric> get metrics => $_getList(5);
+  $pb.PbList<SimpleJSONMetric> get metrics => $_getList(3);
 
   @$pb.TagNumber(7)
-  $core.String get targetTimeZone => $_getSZ(6);
+  $core.String get targetTimeZone => $_getSZ(4);
   @$pb.TagNumber(7)
-  set targetTimeZone($core.String value) => $_setString(6, value);
+  set targetTimeZone($core.String value) => $_setString(4, value);
   @$pb.TagNumber(7)
-  $core.bool hasTargetTimeZone() => $_has(6);
+  $core.bool hasTargetTimeZone() => $_has(4);
   @$pb.TagNumber(7)
   void clearTargetTimeZone() => $_clearField(7);
 
   @$pb.TagNumber(8)
-  $core.String get kpiGroupName => $_getSZ(7);
+  $core.String get kpiGroupName => $_getSZ(5);
   @$pb.TagNumber(8)
-  set kpiGroupName($core.String value) => $_setString(7, value);
+  set kpiGroupName($core.String value) => $_setString(5, value);
   @$pb.TagNumber(8)
-  $core.bool hasKpiGroupName() => $_has(7);
+  $core.bool hasKpiGroupName() => $_has(5);
   @$pb.TagNumber(8)
   void clearKpiGroupName() => $_clearField(8);
 
@@ -1453,24 +990,234 @@ class GetKPIDataSimpleJSONQuery extends $pb.GeneratedMessage {
   /// When set, they are applied as StartDate/EndDate on every date-type filter
   /// dimension that does not already define explicit date bounds.
   @$pb.TagNumber(9)
-  $core.String get dateRangeStart => $_getSZ(8);
+  $core.String get dateRangeStart => $_getSZ(6);
   @$pb.TagNumber(9)
-  set dateRangeStart($core.String value) => $_setString(8, value);
+  set dateRangeStart($core.String value) => $_setString(6, value);
   @$pb.TagNumber(9)
-  $core.bool hasDateRangeStart() => $_has(8);
+  $core.bool hasDateRangeStart() => $_has(6);
   @$pb.TagNumber(9)
   void clearDateRangeStart() => $_clearField(9);
 
   @$pb.TagNumber(10)
-  $core.String get dateRangeEnd => $_getSZ(9);
+  $core.String get dateRangeEnd => $_getSZ(7);
   @$pb.TagNumber(10)
-  set dateRangeEnd($core.String value) => $_setString(9, value);
+  set dateRangeEnd($core.String value) => $_setString(7, value);
   @$pb.TagNumber(10)
-  $core.bool hasDateRangeEnd() => $_has(9);
+  $core.bool hasDateRangeEnd() => $_has(7);
   @$pb.TagNumber(10)
   void clearDateRangeEnd() => $_clearField(10);
 }
 
+class SimpleJSONDimension extends $pb.GeneratedMessage {
+  factory SimpleJSONDimension({
+    $core.String? name,
+    KpiDimensionGranularity? granularity,
+  }) {
+    final result = create();
+    if (name != null) result.name = name;
+    if (granularity != null) result.granularity = granularity;
+    return result;
+  }
+
+  SimpleJSONDimension._();
+
+  factory SimpleJSONDimension.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory SimpleJSONDimension.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SimpleJSONDimension', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
+    ..e<KpiDimensionGranularity>(2, _omitFieldNames ? '' : 'Granularity', $pb.PbFieldType.OE, protoName: 'Granularity', defaultOrMaker: KpiDimensionGranularity.KPI_DIMENSION_GRANULARITY_UNKNOWN, valueOf: KpiDimensionGranularity.valueOf, enumValues: KpiDimensionGranularity.values)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  SimpleJSONDimension clone() => SimpleJSONDimension()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  SimpleJSONDimension copyWith(void Function(SimpleJSONDimension) updates) => super.copyWith((message) => updates(message as SimpleJSONDimension)) as SimpleJSONDimension;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static SimpleJSONDimension create() => SimpleJSONDimension._();
+  @$core.override
+  SimpleJSONDimension createEmptyInstance() => create();
+  static $pb.PbList<SimpleJSONDimension> createRepeated() => $pb.PbList<SimpleJSONDimension>();
+  @$core.pragma('dart2js:noInline')
+  static SimpleJSONDimension getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SimpleJSONDimension>(create);
+  static SimpleJSONDimension? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get name => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set name($core.String value) => $_setString(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasName() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearName() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  KpiDimensionGranularity get granularity => $_getN(1);
+  @$pb.TagNumber(2)
+  set granularity(KpiDimensionGranularity value) => $_setField(2, value);
+  @$pb.TagNumber(2)
+  $core.bool hasGranularity() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearGranularity() => $_clearField(2);
+}
+
+class SimpleJSONMetric extends $pb.GeneratedMessage {
+  factory SimpleJSONMetric({
+    $core.String? name,
+  }) {
+    final result = create();
+    if (name != null) result.name = name;
+    return result;
+  }
+
+  SimpleJSONMetric._();
+
+  factory SimpleJSONMetric.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory SimpleJSONMetric.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SimpleJSONMetric', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  SimpleJSONMetric clone() => SimpleJSONMetric()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  SimpleJSONMetric copyWith(void Function(SimpleJSONMetric) updates) => super.copyWith((message) => updates(message as SimpleJSONMetric)) as SimpleJSONMetric;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static SimpleJSONMetric create() => SimpleJSONMetric._();
+  @$core.override
+  SimpleJSONMetric createEmptyInstance() => create();
+  static $pb.PbList<SimpleJSONMetric> createRepeated() => $pb.PbList<SimpleJSONMetric>();
+  @$core.pragma('dart2js:noInline')
+  static SimpleJSONMetric getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SimpleJSONMetric>(create);
+  static SimpleJSONMetric? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get name => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set name($core.String value) => $_setString(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasName() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearName() => $_clearField(1);
+}
+
+class SimpleJSONFilter extends $pb.GeneratedMessage {
+  factory SimpleJSONFilter({
+    $core.String? dimensionName,
+    KPIFilterOperator? operator,
+    $core.Iterable<$core.String>? values,
+    $0.StringDateObject? startDate,
+    $0.StringDateObject? endDate,
+    SimpleJSONFilter? or,
+  }) {
+    final result = create();
+    if (dimensionName != null) result.dimensionName = dimensionName;
+    if (operator != null) result.operator = operator;
+    if (values != null) result.values.addAll(values);
+    if (startDate != null) result.startDate = startDate;
+    if (endDate != null) result.endDate = endDate;
+    if (or != null) result.or = or;
+    return result;
+  }
+
+  SimpleJSONFilter._();
+
+  factory SimpleJSONFilter.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory SimpleJSONFilter.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SimpleJSONFilter', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'DimensionName', protoName: 'DimensionName')
+    ..e<KPIFilterOperator>(3, _omitFieldNames ? '' : 'Operator', $pb.PbFieldType.OE, protoName: 'Operator', defaultOrMaker: KPIFilterOperator.KPI_FILTER_OPERATOR_UNKNOWN, valueOf: KPIFilterOperator.valueOf, enumValues: KPIFilterOperator.values)
+    ..pPS(4, _omitFieldNames ? '' : 'Values', protoName: 'Values')
+    ..aOM<$0.StringDateObject>(5, _omitFieldNames ? '' : 'StartDate', protoName: 'StartDate', subBuilder: $0.StringDateObject.create)
+    ..aOM<$0.StringDateObject>(6, _omitFieldNames ? '' : 'EndDate', protoName: 'EndDate', subBuilder: $0.StringDateObject.create)
+    ..aOM<SimpleJSONFilter>(7, _omitFieldNames ? '' : 'Or', protoName: 'Or', subBuilder: SimpleJSONFilter.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  SimpleJSONFilter clone() => SimpleJSONFilter()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  SimpleJSONFilter copyWith(void Function(SimpleJSONFilter) updates) => super.copyWith((message) => updates(message as SimpleJSONFilter)) as SimpleJSONFilter;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static SimpleJSONFilter create() => SimpleJSONFilter._();
+  @$core.override
+  SimpleJSONFilter createEmptyInstance() => create();
+  static $pb.PbList<SimpleJSONFilter> createRepeated() => $pb.PbList<SimpleJSONFilter>();
+  @$core.pragma('dart2js:noInline')
+  static SimpleJSONFilter getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SimpleJSONFilter>(create);
+  static SimpleJSONFilter? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get dimensionName => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set dimensionName($core.String value) => $_setString(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasDimensionName() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearDimensionName() => $_clearField(1);
+
+  @$pb.TagNumber(3)
+  KPIFilterOperator get operator => $_getN(1);
+  @$pb.TagNumber(3)
+  set operator(KPIFilterOperator value) => $_setField(3, value);
+  @$pb.TagNumber(3)
+  $core.bool hasOperator() => $_has(1);
+  @$pb.TagNumber(3)
+  void clearOperator() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$core.String> get values => $_getList(2);
+
+  @$pb.TagNumber(5)
+  $0.StringDateObject get startDate => $_getN(3);
+  @$pb.TagNumber(5)
+  set startDate($0.StringDateObject value) => $_setField(5, value);
+  @$pb.TagNumber(5)
+  $core.bool hasStartDate() => $_has(3);
+  @$pb.TagNumber(5)
+  void clearStartDate() => $_clearField(5);
+  @$pb.TagNumber(5)
+  $0.StringDateObject ensureStartDate() => $_ensure(3);
+
+  @$pb.TagNumber(6)
+  $0.StringDateObject get endDate => $_getN(4);
+  @$pb.TagNumber(6)
+  set endDate($0.StringDateObject value) => $_setField(6, value);
+  @$pb.TagNumber(6)
+  $core.bool hasEndDate() => $_has(4);
+  @$pb.TagNumber(6)
+  void clearEndDate() => $_clearField(6);
+  @$pb.TagNumber(6)
+  $0.StringDateObject ensureEndDate() => $_ensure(4);
+
+  @$pb.TagNumber(7)
+  SimpleJSONFilter get or => $_getN(5);
+  @$pb.TagNumber(7)
+  set or(SimpleJSONFilter value) => $_setField(7, value);
+  @$pb.TagNumber(7)
+  $core.bool hasOr() => $_has(5);
+  @$pb.TagNumber(7)
+  void clearOr() => $_clearField(7);
+  @$pb.TagNumber(7)
+  SimpleJSONFilter ensureOr() => $_ensure(5);
+}
+
 /// SimpleJSONColumn is a column header in the SimpleJSON table format (Grafana-compatible).
 class SimpleJSONColumn extends $pb.GeneratedMessage {
   factory SimpleJSONColumn({
diff --git a/lib/clickhouse.pbenum.dart b/lib/clickhouse.pbenum.dart
index 3f9c3ad9..164b02c1 100644
--- a/lib/clickhouse.pbenum.dart
+++ b/lib/clickhouse.pbenum.dart
@@ -81,5 +81,69 @@ class KpiDataResultFormat extends $pb.ProtobufEnum {
   const KpiDataResultFormat._(super.value, super.name);
 }
 
+class KpiDimensionGranularity extends $pb.ProtobufEnum {
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_UNKNOWN = KpiDimensionGranularity._(0, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_UNKNOWN');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_DAY = KpiDimensionGranularity._(1, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_DAY');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_WEEK = KpiDimensionGranularity._(2, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_WEEK');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_MONTH = KpiDimensionGranularity._(3, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_MONTH');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_YEAR = KpiDimensionGranularity._(4, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_YEAR');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_5_MINUTE = KpiDimensionGranularity._(5, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_5_MINUTE');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_10_MINUTE = KpiDimensionGranularity._(6, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_10_MINUTE');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_15_MINUTE = KpiDimensionGranularity._(7, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_15_MINUTE');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_30_MINUTE = KpiDimensionGranularity._(8, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_30_MINUTE');
+  static const KpiDimensionGranularity KPI_DIMENSION_GRANULARITY_HOUR = KpiDimensionGranularity._(9, _omitEnumNames ? '' : 'KPI_DIMENSION_GRANULARITY_HOUR');
+
+  static const $core.List<KpiDimensionGranularity> values = <KpiDimensionGranularity> [
+    KPI_DIMENSION_GRANULARITY_UNKNOWN,
+    KPI_DIMENSION_GRANULARITY_DAY,
+    KPI_DIMENSION_GRANULARITY_WEEK,
+    KPI_DIMENSION_GRANULARITY_MONTH,
+    KPI_DIMENSION_GRANULARITY_YEAR,
+    KPI_DIMENSION_GRANULARITY_5_MINUTE,
+    KPI_DIMENSION_GRANULARITY_10_MINUTE,
+    KPI_DIMENSION_GRANULARITY_15_MINUTE,
+    KPI_DIMENSION_GRANULARITY_30_MINUTE,
+    KPI_DIMENSION_GRANULARITY_HOUR,
+  ];
+
+  static final $core.List<KpiDimensionGranularity?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 9);
+  static KpiDimensionGranularity? valueOf($core.int value) =>  value < 0 || value >= _byValue.length ? null : _byValue[value];
+
+  const KpiDimensionGranularity._(super.value, super.name);
+}
+
+class KPIFilterOperator extends $pb.ProtobufEnum {
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_UNKNOWN = KPIFilterOperator._(0, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_UNKNOWN');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_EQUAL = KPIFilterOperator._(1, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_EQUAL');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_DIFF = KPIFilterOperator._(2, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_DIFF');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_START_BY = KPIFilterOperator._(3, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_START_BY');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_NOT_START_BY = KPIFilterOperator._(4, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_NOT_START_BY');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_FINISH_BY = KPIFilterOperator._(5, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_FINISH_BY');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_NOT_FINISH_BY = KPIFilterOperator._(6, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_NOT_FINISH_BY');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_CONTAINS = KPIFilterOperator._(7, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_CONTAINS');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_NOT_CONTAINS = KPIFilterOperator._(8, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_NOT_CONTAINS');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_IN_LIST = KPIFilterOperator._(9, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_IN_LIST');
+  static const KPIFilterOperator KPI_FILTER_OPERATOR_NOT_IN_LIST = KPIFilterOperator._(10, _omitEnumNames ? '' : 'KPI_FILTER_OPERATOR_NOT_IN_LIST');
+
+  static const $core.List<KPIFilterOperator> values = <KPIFilterOperator> [
+    KPI_FILTER_OPERATOR_UNKNOWN,
+    KPI_FILTER_OPERATOR_EQUAL,
+    KPI_FILTER_OPERATOR_DIFF,
+    KPI_FILTER_OPERATOR_START_BY,
+    KPI_FILTER_OPERATOR_NOT_START_BY,
+    KPI_FILTER_OPERATOR_FINISH_BY,
+    KPI_FILTER_OPERATOR_NOT_FINISH_BY,
+    KPI_FILTER_OPERATOR_CONTAINS,
+    KPI_FILTER_OPERATOR_NOT_CONTAINS,
+    KPI_FILTER_OPERATOR_IN_LIST,
+    KPI_FILTER_OPERATOR_NOT_IN_LIST,
+  ];
+
+  static final $core.List<KPIFilterOperator?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 10);
+  static KPIFilterOperator? valueOf($core.int value) =>  value < 0 || value >= _byValue.length ? null : _byValue[value];
+
+  const KPIFilterOperator._(super.value, super.name);
+}
+
 
 const $core.bool _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/lib/clickhouse.pbjson.dart b/lib/clickhouse.pbjson.dart
index 53fcdce4..b4a326f8 100644
--- a/lib/clickhouse.pbjson.dart
+++ b/lib/clickhouse.pbjson.dart
@@ -72,6 +72,63 @@ final $typed_data.Uint8List kpiDataResultFormatDescriptor = $convert.base64Decod
     'ChNLcGlEYXRhUmVzdWx0Rm9ybWF0Eh0KGUtQSURBVEFfUkVTVUxUX0ZPUk1BVF9SQVcQABIgCh'
     'xLUElEQVRBX1JFU1VMVF9GT1JNQVRfU0VSSUVTEAE=');
 
+@$core.Deprecated('Use kpiDimensionGranularityDescriptor instead')
+const KpiDimensionGranularity$json = {
+  '1': 'KpiDimensionGranularity',
+  '2': [
+    {'1': 'KPI_DIMENSION_GRANULARITY_UNKNOWN', '2': 0},
+    {'1': 'KPI_DIMENSION_GRANULARITY_DAY', '2': 1},
+    {'1': 'KPI_DIMENSION_GRANULARITY_WEEK', '2': 2},
+    {'1': 'KPI_DIMENSION_GRANULARITY_MONTH', '2': 3},
+    {'1': 'KPI_DIMENSION_GRANULARITY_YEAR', '2': 4},
+    {'1': 'KPI_DIMENSION_GRANULARITY_5_MINUTE', '2': 5},
+    {'1': 'KPI_DIMENSION_GRANULARITY_10_MINUTE', '2': 6},
+    {'1': 'KPI_DIMENSION_GRANULARITY_15_MINUTE', '2': 7},
+    {'1': 'KPI_DIMENSION_GRANULARITY_30_MINUTE', '2': 8},
+    {'1': 'KPI_DIMENSION_GRANULARITY_HOUR', '2': 9},
+  ],
+};
+
+/// Descriptor for `KpiDimensionGranularity`. Decode as a `google.protobuf.EnumDescriptorProto`.
+final $typed_data.Uint8List kpiDimensionGranularityDescriptor = $convert.base64Decode(
+    'ChdLcGlEaW1lbnNpb25HcmFudWxhcml0eRIlCiFLUElfRElNRU5TSU9OX0dSQU5VTEFSSVRZX1'
+    'VOS05PV04QABIhCh1LUElfRElNRU5TSU9OX0dSQU5VTEFSSVRZX0RBWRABEiIKHktQSV9ESU1F'
+    'TlNJT05fR1JBTlVMQVJJVFlfV0VFSxACEiMKH0tQSV9ESU1FTlNJT05fR1JBTlVMQVJJVFlfTU'
+    '9OVEgQAxIiCh5LUElfRElNRU5TSU9OX0dSQU5VTEFSSVRZX1lFQVIQBBImCiJLUElfRElNRU5T'
+    'SU9OX0dSQU5VTEFSSVRZXzVfTUlOVVRFEAUSJwojS1BJX0RJTUVOU0lPTl9HUkFOVUxBUklUWV'
+    '8xMF9NSU5VVEUQBhInCiNLUElfRElNRU5TSU9OX0dSQU5VTEFSSVRZXzE1X01JTlVURRAHEicK'
+    'I0tQSV9ESU1FTlNJT05fR1JBTlVMQVJJVFlfMzBfTUlOVVRFEAgSIgoeS1BJX0RJTUVOU0lPTl'
+    '9HUkFOVUxBUklUWV9IT1VSEAk=');
+
+@$core.Deprecated('Use kPIFilterOperatorDescriptor instead')
+const KPIFilterOperator$json = {
+  '1': 'KPIFilterOperator',
+  '2': [
+    {'1': 'KPI_FILTER_OPERATOR_UNKNOWN', '2': 0},
+    {'1': 'KPI_FILTER_OPERATOR_EQUAL', '2': 1},
+    {'1': 'KPI_FILTER_OPERATOR_DIFF', '2': 2},
+    {'1': 'KPI_FILTER_OPERATOR_START_BY', '2': 3},
+    {'1': 'KPI_FILTER_OPERATOR_NOT_START_BY', '2': 4},
+    {'1': 'KPI_FILTER_OPERATOR_FINISH_BY', '2': 5},
+    {'1': 'KPI_FILTER_OPERATOR_NOT_FINISH_BY', '2': 6},
+    {'1': 'KPI_FILTER_OPERATOR_CONTAINS', '2': 7},
+    {'1': 'KPI_FILTER_OPERATOR_NOT_CONTAINS', '2': 8},
+    {'1': 'KPI_FILTER_OPERATOR_IN_LIST', '2': 9},
+    {'1': 'KPI_FILTER_OPERATOR_NOT_IN_LIST', '2': 10},
+  ],
+};
+
+/// Descriptor for `KPIFilterOperator`. Decode as a `google.protobuf.EnumDescriptorProto`.
+final $typed_data.Uint8List kPIFilterOperatorDescriptor = $convert.base64Decode(
+    'ChFLUElGaWx0ZXJPcGVyYXRvchIfChtLUElfRklMVEVSX09QRVJBVE9SX1VOS05PV04QABIdCh'
+    'lLUElfRklMVEVSX09QRVJBVE9SX0VRVUFMEAESHAoYS1BJX0ZJTFRFUl9PUEVSQVRPUl9ESUZG'
+    'EAISIAocS1BJX0ZJTFRFUl9PUEVSQVRPUl9TVEFSVF9CWRADEiQKIEtQSV9GSUxURVJfT1BFUk'
+    'FUT1JfTk9UX1NUQVJUX0JZEAQSIQodS1BJX0ZJTFRFUl9PUEVSQVRPUl9GSU5JU0hfQlkQBRIl'
+    'CiFLUElfRklMVEVSX09QRVJBVE9SX05PVF9GSU5JU0hfQlkQBhIgChxLUElfRklMVEVSX09QRV'
+    'JBVE9SX0NPTlRBSU5TEAcSJAogS1BJX0ZJTFRFUl9PUEVSQVRPUl9OT1RfQ09OVEFJTlMQCBIf'
+    'ChtLUElfRklMVEVSX09QRVJBVE9SX0lOX0xJU1QQCRIjCh9LUElfRklMVEVSX09QRVJBVE9SX0'
+    '5PVF9JTl9MSVNUEAo=');
+
 @$core.Deprecated('Use cHDimensionDescriptor instead')
 const CHDimension$json = {
   '1': 'CHDimension',
@@ -154,88 +211,6 @@ final $typed_data.Uint8List cHMetricDescriptor = $convert.base64Decode(
     'RlZBgNIAEoCFIKSXNDb21wdXRlZDotkkEqCijSAQROYW1l0gEFTGV2ZWzSAQhEYXRhVHlwZdIB'
     'C0NvbnRlbnRUeXBl');
 
-@$core.Deprecated('Use simpleJSONQueryExpressionDescriptor instead')
-const SimpleJSONQueryExpression$json = {
-  '1': 'SimpleJSONQueryExpression',
-  '2': [
-    {'1': 'Block', '3': 1, '4': 1, '5': 9, '10': 'Block'},
-    {'1': 'QueryType', '3': 2, '4': 1, '5': 14, '6': '.api.CHQueryType', '10': 'QueryType'},
-    {'1': 'Field', '3': 3, '4': 1, '5': 9, '10': 'Field'},
-    {'1': 'Query', '3': 4, '4': 1, '5': 9, '10': 'Query'},
-  ],
-};
-
-/// Descriptor for `SimpleJSONQueryExpression`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List simpleJSONQueryExpressionDescriptor = $convert.base64Decode(
-    'ChlTaW1wbGVKU09OUXVlcnlFeHByZXNzaW9uEhQKBUJsb2NrGAEgASgJUgVCbG9jaxIuCglRdW'
-    'VyeVR5cGUYAiABKA4yEC5hcGkuQ0hRdWVyeVR5cGVSCVF1ZXJ5VHlwZRIUCgVGaWVsZBgDIAEo'
-    'CVIFRmllbGQSFAoFUXVlcnkYBCABKAlSBVF1ZXJ5');
-
-@$core.Deprecated('Use simpleJSONDimensionDescriptor instead')
-const SimpleJSONDimension$json = {
-  '1': 'SimpleJSONDimension',
-  '2': [
-    {'1': 'Name', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'Name'},
-    {'1': 'Granularity', '3': 2, '4': 1, '5': 9, '10': 'Granularity'},
-    {'1': 'Level', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'Level'},
-    {'1': 'DataType', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'DataType'},
-    {'1': 'ContentType', '3': 5, '4': 1, '5': 9, '8': {}, '10': 'ContentType'},
-    {'1': 'EnumValues', '3': 6, '4': 1, '5': 9, '10': 'EnumValues'},
-    {'1': 'Period', '3': 7, '4': 1, '5': 9, '8': {}, '10': 'Period'},
-    {'1': 'Operator', '3': 8, '4': 1, '5': 9, '8': {}, '10': 'Operator'},
-    {'1': 'Values', '3': 9, '4': 3, '5': 9, '10': 'Values'},
-    {'1': 'StartDate', '3': 10, '4': 1, '5': 11, '6': '.api.StringDateObject', '10': 'StartDate'},
-    {'1': 'EndDate', '3': 11, '4': 1, '5': 11, '6': '.api.StringDateObject', '10': 'EndDate'},
-    {'1': 'Expressions', '3': 12, '4': 3, '5': 11, '6': '.api.SimpleJSONQueryExpression', '10': 'Expressions'},
-    {'1': 'IsComputed', '3': 13, '4': 1, '5': 8, '10': 'IsComputed'},
-    {'1': 'Or', '3': 14, '4': 1, '5': 11, '6': '.api.SimpleJSONDimension', '10': 'Or'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `SimpleJSONDimension`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List simpleJSONDimensionDescriptor = $convert.base64Decode(
-    'ChNTaW1wbGVKU09ORGltZW5zaW9uEhwKBE5hbWUYASABKAlCCLqBAQRyAhABUgROYW1lEiAKC0'
-    'dyYW51bGFyaXR5GAIgASgJUgtHcmFudWxhcml0eRIeCgVMZXZlbBgDIAEoCUIIuoEBBHICEAFS'
-    'BUxldmVsEi8KCERhdGFUeXBlGAQgASgJQhOSQQhKBiJkYXRlIrqBAQRyAhABUghEYXRhVHlwZR'
-    'I5CgtDb250ZW50VHlwZRgFIAEoCUIXkkEMSgoiRGF0ZVRpbWUiuoEBBHICEAFSC0NvbnRlbnRU'
-    'eXBlEh4KCkVudW1WYWx1ZXMYBiABKAlSCkVudW1WYWx1ZXMSLQoGUGVyaW9kGAcgASgJQhWSQR'
-    'IyEEEgcGVyaW9kIG9mIHRpbWVSBlBlcmlvZBK4AQoIT3BlcmF0b3IYCCABKAlCmwGSQZcBMpQB'
-    'QWxsb3dlZCB2YWx1ZXMgOiAiIiwgIkVRVUFMIiwgIkRJRkYiLCAiU1RBUlRfQlkiLCAiTk9UX1'
-    'NUQVJUX0JZIiwgIkZJTklTSF9CWSIsICJOT1RfRklOSVNIX0JZIiwgIkNPTlRBSU5TIiwgIk5P'
-    'VF9DT05UQUlOUyIsICJJTl9MSVNUIiwgIk5PVF9JTl9MSVNUIlIIT3BlcmF0b3ISFgoGVmFsdW'
-    'VzGAkgAygJUgZWYWx1ZXMSMwoJU3RhcnREYXRlGAogASgLMhUuYXBpLlN0cmluZ0RhdGVPYmpl'
-    'Y3RSCVN0YXJ0RGF0ZRIvCgdFbmREYXRlGAsgASgLMhUuYXBpLlN0cmluZ0RhdGVPYmplY3RSB0'
-    'VuZERhdGUSQAoLRXhwcmVzc2lvbnMYDCADKAsyHi5hcGkuU2ltcGxlSlNPTlF1ZXJ5RXhwcmVz'
-    'c2lvblILRXhwcmVzc2lvbnMSHgoKSXNDb21wdXRlZBgNIAEoCFIKSXNDb21wdXRlZBIoCgJPch'
-    'gOIAEoCzIYLmFwaS5TaW1wbGVKU09ORGltZW5zaW9uUgJPcjotkkEqCijSAQROYW1l0gEFTGV2'
-    'ZWzSAQhEYXRhVHlwZdIBC0NvbnRlbnRUeXBl');
-
-@$core.Deprecated('Use simpleJSONMetricDescriptor instead')
-const SimpleJSONMetric$json = {
-  '1': 'SimpleJSONMetric',
-  '2': [
-    {'1': 'Name', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'Name'},
-    {'1': 'Level', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'Level'},
-    {'1': 'DataType', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'DataType'},
-    {'1': 'ContentType', '3': 5, '4': 1, '5': 9, '8': {}, '10': 'ContentType'},
-    {'1': 'EnumValues', '3': 6, '4': 1, '5': 9, '10': 'EnumValues'},
-    {'1': 'Expressions', '3': 12, '4': 3, '5': 11, '6': '.api.SimpleJSONQueryExpression', '10': 'Expressions'},
-    {'1': 'IsComputed', '3': 13, '4': 1, '5': 8, '10': 'IsComputed'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `SimpleJSONMetric`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List simpleJSONMetricDescriptor = $convert.base64Decode(
-    'ChBTaW1wbGVKU09OTWV0cmljEhwKBE5hbWUYASABKAlCCLqBAQRyAhABUgROYW1lEh4KBUxldm'
-    'VsGAMgASgJQgi6gQEEcgIQAVIFTGV2ZWwSMAoIRGF0YVR5cGUYBCABKAlCFJJBCUoHImNvdW50'
-    'IrqBAQRyAhABUghEYXRhVHlwZRI0CgtDb250ZW50VHlwZRgFIAEoCUISkkEHSgUiaW50IrqBAQ'
-    'RyAhABUgtDb250ZW50VHlwZRIeCgpFbnVtVmFsdWVzGAYgASgJUgpFbnVtVmFsdWVzEkAKC0V4'
-    'cHJlc3Npb25zGAwgAygLMh4uYXBpLlNpbXBsZUpTT05RdWVyeUV4cHJlc3Npb25SC0V4cHJlc3'
-    'Npb25zEh4KCklzQ29tcHV0ZWQYDSABKAhSCklzQ29tcHV0ZWQ6LZJBKgoo0gEETmFtZdIBBUxl'
-    'dmVs0gEIRGF0YVR5cGXSAQtDb250ZW50VHlwZQ==');
-
 @$core.Deprecated('Use cHFilterDescriptor instead')
 const CHFilter$json = {
   '1': 'CHFilter',
@@ -249,19 +224,6 @@ final $typed_data.Uint8List cHFilterDescriptor = $convert.base64Decode(
     'CghDSEZpbHRlchIwCgpEaW1lbnNpb25zGAEgAygLMhAuYXBpLkNIRGltZW5zaW9uUgpEaW1lbn'
     'Npb25z');
 
-@$core.Deprecated('Use simpleJSONFilterDescriptor instead')
-const SimpleJSONFilter$json = {
-  '1': 'SimpleJSONFilter',
-  '2': [
-    {'1': 'Dimensions', '3': 1, '4': 3, '5': 11, '6': '.api.SimpleJSONDimension', '10': 'Dimensions'},
-  ],
-};
-
-/// Descriptor for `SimpleJSONFilter`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List simpleJSONFilterDescriptor = $convert.base64Decode(
-    'ChBTaW1wbGVKU09ORmlsdGVyEjgKCkRpbWVuc2lvbnMYASADKAsyGC5hcGkuU2ltcGxlSlNPTk'
-    'RpbWVuc2lvblIKRGltZW5zaW9ucw==');
-
 @$core.Deprecated('Use kpiDataSerieDescriptor instead')
 const KpiDataSerie$json = {
   '1': 'KpiDataSerie',
@@ -384,9 +346,7 @@ const GetKPIDataSimpleJSONQuery$json = {
   '1': 'GetKPIDataSimpleJSONQuery',
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '10': 'Header'},
-    {'1': 'QueryType', '3': 2, '4': 1, '5': 14, '6': '.api.CHQueryType', '10': 'QueryType'},
-    {'1': 'QueryBlock', '3': 3, '4': 1, '5': 9, '10': 'QueryBlock'},
-    {'1': 'Filter', '3': 4, '4': 1, '5': 11, '6': '.api.SimpleJSONFilter', '10': 'Filter'},
+    {'1': 'Filters', '3': 4, '4': 3, '5': 11, '6': '.api.SimpleJSONFilter', '10': 'Filters'},
     {'1': 'Dimensions', '3': 5, '4': 3, '5': 11, '6': '.api.SimpleJSONDimension', '10': 'Dimensions'},
     {'1': 'Metrics', '3': 6, '4': 3, '5': 11, '6': '.api.SimpleJSONMetric', '10': 'Metrics'},
     {'1': 'TargetTimeZone', '3': 7, '4': 1, '5': 9, '10': 'TargetTimeZone'},
@@ -399,14 +359,70 @@ const GetKPIDataSimpleJSONQuery$json = {
 /// Descriptor for `GetKPIDataSimpleJSONQuery`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getKPIDataSimpleJSONQueryDescriptor = $convert.base64Decode(
     'ChlHZXRLUElEYXRhU2ltcGxlSlNPTlF1ZXJ5Ei8KBkhlYWRlchgBIAEoCzIXLmFwaS5RdWVyeV'
-    'Byb2plY3RIZWFkZXJSBkhlYWRlchIuCglRdWVyeVR5cGUYAiABKA4yEC5hcGkuQ0hRdWVyeVR5'
-    'cGVSCVF1ZXJ5VHlwZRIeCgpRdWVyeUJsb2NrGAMgASgJUgpRdWVyeUJsb2NrEi0KBkZpbHRlch'
-    'gEIAEoCzIVLmFwaS5TaW1wbGVKU09ORmlsdGVyUgZGaWx0ZXISOAoKRGltZW5zaW9ucxgFIAMo'
-    'CzIYLmFwaS5TaW1wbGVKU09ORGltZW5zaW9uUgpEaW1lbnNpb25zEi8KB01ldHJpY3MYBiADKA'
-    'syFS5hcGkuU2ltcGxlSlNPTk1ldHJpY1IHTWV0cmljcxImCg5UYXJnZXRUaW1lWm9uZRgHIAEo'
-    'CVIOVGFyZ2V0VGltZVpvbmUSIgoMS3BpR3JvdXBOYW1lGAggASgJUgxLcGlHcm91cE5hbWUSJg'
-    'oORGF0ZVJhbmdlU3RhcnQYCSABKAlSDkRhdGVSYW5nZVN0YXJ0EiIKDERhdGVSYW5nZUVuZBgK'
-    'IAEoCVIMRGF0ZVJhbmdlRW5k');
+    'Byb2plY3RIZWFkZXJSBkhlYWRlchIvCgdGaWx0ZXJzGAQgAygLMhUuYXBpLlNpbXBsZUpTT05G'
+    'aWx0ZXJSB0ZpbHRlcnMSOAoKRGltZW5zaW9ucxgFIAMoCzIYLmFwaS5TaW1wbGVKU09ORGltZW'
+    '5zaW9uUgpEaW1lbnNpb25zEi8KB01ldHJpY3MYBiADKAsyFS5hcGkuU2ltcGxlSlNPTk1ldHJp'
+    'Y1IHTWV0cmljcxImCg5UYXJnZXRUaW1lWm9uZRgHIAEoCVIOVGFyZ2V0VGltZVpvbmUSIgoMS3'
+    'BpR3JvdXBOYW1lGAggASgJUgxLcGlHcm91cE5hbWUSJgoORGF0ZVJhbmdlU3RhcnQYCSABKAlS'
+    'DkRhdGVSYW5nZVN0YXJ0EiIKDERhdGVSYW5nZUVuZBgKIAEoCVIMRGF0ZVJhbmdlRW5k');
+
+@$core.Deprecated('Use simpleJSONDimensionDescriptor instead')
+const SimpleJSONDimension$json = {
+  '1': 'SimpleJSONDimension',
+  '2': [
+    {'1': 'Name', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'Name'},
+    {'1': 'Granularity', '3': 2, '4': 1, '5': 14, '6': '.api.KpiDimensionGranularity', '10': 'Granularity'},
+  ],
+  '7': {},
+};
+
+/// Descriptor for `SimpleJSONDimension`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List simpleJSONDimensionDescriptor = $convert.base64Decode(
+    'ChNTaW1wbGVKU09ORGltZW5zaW9uEhwKBE5hbWUYASABKAlCCLqBAQRyAhABUgROYW1lEj4KC0'
+    'dyYW51bGFyaXR5GAIgASgOMhwuYXBpLktwaURpbWVuc2lvbkdyYW51bGFyaXR5UgtHcmFudWxh'
+    'cml0eToMkkEJCgfSAQROYW1l');
+
+@$core.Deprecated('Use simpleJSONMetricDescriptor instead')
+const SimpleJSONMetric$json = {
+  '1': 'SimpleJSONMetric',
+  '2': [
+    {'1': 'Name', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'Name'},
+  ],
+  '7': {},
+};
+
+/// Descriptor for `SimpleJSONMetric`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List simpleJSONMetricDescriptor = $convert.base64Decode(
+    'ChBTaW1wbGVKU09OTWV0cmljEhwKBE5hbWUYASABKAlCCLqBAQRyAhABUgROYW1lOgySQQkKB9'
+    'IBBE5hbWU=');
+
+@$core.Deprecated('Use simpleJSONFilterDescriptor instead')
+const SimpleJSONFilter$json = {
+  '1': 'SimpleJSONFilter',
+  '2': [
+    {'1': 'DimensionName', '3': 1, '4': 1, '5': 9, '10': 'DimensionName'},
+    {'1': 'Operator', '3': 3, '4': 1, '5': 14, '6': '.api.KPIFilterOperator', '8': {}, '10': 'Operator'},
+    {'1': 'Values', '3': 4, '4': 3, '5': 9, '10': 'Values'},
+    {'1': 'StartDate', '3': 5, '4': 1, '5': 11, '6': '.api.StringDateObject', '10': 'StartDate'},
+    {'1': 'EndDate', '3': 6, '4': 1, '5': 11, '6': '.api.StringDateObject', '10': 'EndDate'},
+    {'1': 'Or', '3': 7, '4': 1, '5': 11, '6': '.api.SimpleJSONFilter', '10': 'Or'},
+  ],
+};
+
+/// Descriptor for `SimpleJSONFilter`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List simpleJSONFilterDescriptor = $convert.base64Decode(
+    'ChBTaW1wbGVKU09ORmlsdGVyEiQKDURpbWVuc2lvbk5hbWUYASABKAlSDURpbWVuc2lvbk5hbW'
+    'USlAMKCE9wZXJhdG9yGAMgASgOMhYuYXBpLktQSUZpbHRlck9wZXJhdG9yQt8CkkHbAjLYAkFs'
+    'bG93ZWQgdmFsdWVzIDogIktQSV9GSUxURVJfT1BFUkFUT1JfRVFVQUwiLCAiS1BJX0ZJTFRFUl'
+    '9PUEVSQVRPUl9ESUZGIiwgIktQSV9GSUxURVJfT1BFUkFUT1JfU1RBUlRfQlkiLCAiS1BJX0ZJ'
+    'TFRFUl9PUEVSQVRPUl9OT1RfU1RBUlRfQlkiLCAiS1BJX0ZJTFRFUl9PUEVSQVRPUl9GSU5JU0'
+    'hfQlkiLCAiS1BJX0ZJTFRFUl9PUEVSQVRPUl9OT1RfRklOSVNIX0JZIiwgIktQSV9GSUxURVJf'
+    'T1BFUkFUT1JfQ09OVEFJTlMiLCAiS1BJX0ZJTFRFUl9PUEVSQVRPUl9OT1RfQ09OVEFJTlMiLC'
+    'AiS1BJX0ZJTFRFUl9PUEVSQVRPUl9JTl9MSVNUIiwgIktQSV9GSUxURVJfT1BFUkFUT1JfTk9U'
+    'X0lOX0xJU1QiUghPcGVyYXRvchIWCgZWYWx1ZXMYBCADKAlSBlZhbHVlcxIzCglTdGFydERhdG'
+    'UYBSABKAsyFS5hcGkuU3RyaW5nRGF0ZU9iamVjdFIJU3RhcnREYXRlEi8KB0VuZERhdGUYBiAB'
+    'KAsyFS5hcGkuU3RyaW5nRGF0ZU9iamVjdFIHRW5kRGF0ZRIlCgJPchgHIAEoCzIVLmFwaS5TaW'
+    '1wbGVKU09ORmlsdGVyUgJPcg==');
 
 @$core.Deprecated('Use simpleJSONColumnDescriptor instead')
 const SimpleJSONColumn$json = {
diff --git a/pubspec.yaml b/pubspec.yaml
index 8957ec2a..b55d2970 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dart_core_sdk
 description: dart libs from core model proto files
-version: 1.15.0-SNAPSHOT-260910094535
+version: 1.15.0-SNAPSHOT-260910095605
 homepage: ''
 publish_to: ''
 repository: ''