diff --git a/CHANGELOG.md b/CHANGELOG.md
index c26318b4..efabc86c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # CHANGELOG
 
-Lib version: 1.13.0-SNAPSHOT-260223150731
+Lib version: 1.13.0-SNAPSHOT-260223160249
diff --git a/lib/actorQuery.pb.dart b/lib/actorQuery.pb.dart
index 73fac772..f24c484b 100644
--- a/lib/actorQuery.pb.dart
+++ b/lib/actorQuery.pb.dart
@@ -225,7 +225,7 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -424,7 +424,7 @@ class ActorByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(5)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
diff --git a/lib/appointmentQuery.pb.dart b/lib/appointmentQuery.pb.dart
index 01887234..2da7ba1c 100644
--- a/lib/appointmentQuery.pb.dart
+++ b/lib/appointmentQuery.pb.dart
@@ -225,7 +225,7 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -424,7 +424,7 @@ class AppointmentByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(5)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
@@ -613,7 +613,7 @@ class FindMineQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryBasicHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(2)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
@@ -690,7 +690,7 @@ class FindMineByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryBasicHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(5)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
@@ -859,6 +859,72 @@ class FindByCommissionResult extends $pb.GeneratedMessage {
   void clearQueryContext() => $_clearField(3);
 }
 
+class CrossFindResult extends $pb.GeneratedMessage {
+  factory CrossFindResult({
+    $core.Iterable<$3.Appointment>? objects,
+    $1.ResultHeader? header,
+    $core.String? queryContext,
+  }) {
+    final result = create();
+    if (objects != null) result.objects.addAll(objects);
+    if (header != null) result.header = header;
+    if (queryContext != null) result.queryContext = queryContext;
+    return result;
+  }
+
+  CrossFindResult._();
+
+  factory CrossFindResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory CrossFindResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CrossFindResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..pc<$3.Appointment>(1, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Appointment.create)
+    ..aOM<$1.ResultHeader>(2, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
+    ..aOS(3, _omitFieldNames ? '' : 'QueryContext', protoName: 'QueryContext')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFindResult clone() => CrossFindResult()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFindResult copyWith(void Function(CrossFindResult) updates) => super.copyWith((message) => updates(message as CrossFindResult)) as CrossFindResult;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static CrossFindResult create() => CrossFindResult._();
+  @$core.override
+  CrossFindResult createEmptyInstance() => create();
+  static $pb.PbList<CrossFindResult> createRepeated() => $pb.PbList<CrossFindResult>();
+  @$core.pragma('dart2js:noInline')
+  static CrossFindResult getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CrossFindResult>(create);
+  static CrossFindResult? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $pb.PbList<$3.Appointment> get objects => $_getList(0);
+
+  @$pb.TagNumber(2)
+  $1.ResultHeader get header => $_getN(1);
+  @$pb.TagNumber(2)
+  set header($1.ResultHeader value) => $_setField(2, value);
+  @$pb.TagNumber(2)
+  $core.bool hasHeader() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearHeader() => $_clearField(2);
+  @$pb.TagNumber(2)
+  $1.ResultHeader ensureHeader() => $_ensure(1);
+
+  @$pb.TagNumber(3)
+  $core.String get queryContext => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set queryContext($core.String value) => $_setString(2, value);
+  @$pb.TagNumber(3)
+  $core.bool hasQueryContext() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearQueryContext() => $_clearField(3);
+}
+
 
 const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
 const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/appointmentQuery.pbgrpc.dart b/lib/appointmentQuery.pbgrpc.dart
index feea4f8f..19055ab0 100644
--- a/lib/appointmentQuery.pbgrpc.dart
+++ b/lib/appointmentQuery.pbgrpc.dart
@@ -74,6 +74,18 @@ class AppointmentQueryClient extends $grpc.Client {
     return $createUnaryCall(_$findByCommission, request, options: options);
   }
 
+  $grpc.ResponseFuture<$0.CrossFindResult> crossFind($1.CrossFineQuery request, {$grpc.CallOptions? options,}) {
+    return $createUnaryCall(_$crossFind, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$1.CrossFindByMatchResult> crossFindMatchingFieldValues($1.CrossFindByMatchQuery request, {$grpc.CallOptions? options,}) {
+    return $createUnaryCall(_$crossFindMatchingFieldValues, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$1.ElementByMatchResult> crossFindMatchingFieldElements($1.CrossFindElementByMatchQuery request, {$grpc.CallOptions? options,}) {
+    return $createUnaryCall(_$crossFindMatchingFieldElements, request, options: options);
+  }
+
     // method descriptors
 
   static final _$getByIds = $grpc.ClientMethod<$0.AppointmentByIdQuery, $0.AppointmentByIdResult>(
@@ -116,6 +128,18 @@ class AppointmentQueryClient extends $grpc.Client {
       '/api.AppointmentQuery/FindByCommission',
       ($0.FindByCommissionQuery value) => value.writeToBuffer(),
       $0.FindByCommissionResult.fromBuffer);
+  static final _$crossFind = $grpc.ClientMethod<$1.CrossFineQuery, $0.CrossFindResult>(
+      '/api.AppointmentQuery/CrossFind',
+      ($1.CrossFineQuery value) => value.writeToBuffer(),
+      $0.CrossFindResult.fromBuffer);
+  static final _$crossFindMatchingFieldValues = $grpc.ClientMethod<$1.CrossFindByMatchQuery, $1.CrossFindByMatchResult>(
+      '/api.AppointmentQuery/CrossFindMatchingFieldValues',
+      ($1.CrossFindByMatchQuery value) => value.writeToBuffer(),
+      $1.CrossFindByMatchResult.fromBuffer);
+  static final _$crossFindMatchingFieldElements = $grpc.ClientMethod<$1.CrossFindElementByMatchQuery, $1.ElementByMatchResult>(
+      '/api.AppointmentQuery/CrossFindMatchingFieldElements',
+      ($1.CrossFindElementByMatchQuery value) => value.writeToBuffer(),
+      $1.ElementByMatchResult.fromBuffer);
 }
 
 @$pb.GrpcServiceName('api.AppointmentQuery')
@@ -193,6 +217,27 @@ abstract class AppointmentQueryServiceBase extends $grpc.Service {
         false,
         ($core.List<$core.int> value) => $0.FindByCommissionQuery.fromBuffer(value),
         ($0.FindByCommissionResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.CrossFineQuery, $0.CrossFindResult>(
+        'CrossFind',
+        crossFind_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $1.CrossFineQuery.fromBuffer(value),
+        ($0.CrossFindResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.CrossFindByMatchQuery, $1.CrossFindByMatchResult>(
+        'CrossFindMatchingFieldValues',
+        crossFindMatchingFieldValues_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $1.CrossFindByMatchQuery.fromBuffer(value),
+        ($1.CrossFindByMatchResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.CrossFindElementByMatchQuery, $1.ElementByMatchResult>(
+        'CrossFindMatchingFieldElements',
+        crossFindMatchingFieldElements_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $1.CrossFindElementByMatchQuery.fromBuffer(value),
+        ($1.ElementByMatchResult value) => value.writeToBuffer()));
   }
 
   $async.Future<$0.AppointmentByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentByIdQuery> $request) async {
@@ -255,4 +300,22 @@ abstract class AppointmentQueryServiceBase extends $grpc.Service {
 
   $async.Future<$0.FindByCommissionResult> findByCommission($grpc.ServiceCall call, $0.FindByCommissionQuery request);
 
+  $async.Future<$0.CrossFindResult> crossFind_Pre($grpc.ServiceCall $call, $async.Future<$1.CrossFineQuery> $request) async {
+    return crossFind($call, await $request);
+  }
+
+  $async.Future<$0.CrossFindResult> crossFind($grpc.ServiceCall call, $1.CrossFineQuery request);
+
+  $async.Future<$1.CrossFindByMatchResult> crossFindMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$1.CrossFindByMatchQuery> $request) async {
+    return crossFindMatchingFieldValues($call, await $request);
+  }
+
+  $async.Future<$1.CrossFindByMatchResult> crossFindMatchingFieldValues($grpc.ServiceCall call, $1.CrossFindByMatchQuery request);
+
+  $async.Future<$1.ElementByMatchResult> crossFindMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$1.CrossFindElementByMatchQuery> $request) async {
+    return crossFindMatchingFieldElements($call, await $request);
+  }
+
+  $async.Future<$1.ElementByMatchResult> crossFindMatchingFieldElements($grpc.ServiceCall call, $1.CrossFindElementByMatchQuery request);
+
 }
diff --git a/lib/appointmentQuery.pbjson.dart b/lib/appointmentQuery.pbjson.dart
index 2ca980b0..60af5cb6 100644
--- a/lib/appointmentQuery.pbjson.dart
+++ b/lib/appointmentQuery.pbjson.dart
@@ -248,3 +248,19 @@ final $typed_data.Uint8List findByCommissionResultDescriptor = $convert.base64De
     'FkZXJSBkhlYWRlchIqCgdPYmplY3RzGAIgAygLMhAuYXBpLkFwcG9pbnRtZW50UgdPYmplY3Rz'
     'EiIKDHF1ZXJ5Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');
 
+@$core.Deprecated('Use crossFindResultDescriptor instead')
+const CrossFindResult$json = {
+  '1': 'CrossFindResult',
+  '2': [
+    {'1': 'Objects', '3': 1, '4': 3, '5': 11, '6': '.api.Appointment', '10': 'Objects'},
+    {'1': 'Header', '3': 2, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
+    {'1': 'QueryContext', '3': 3, '4': 1, '5': 9, '10': 'QueryContext'},
+  ],
+};
+
+/// Descriptor for `CrossFindResult`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List crossFindResultDescriptor = $convert.base64Decode(
+    'Cg9Dcm9zc0ZpbmRSZXN1bHQSKgoHT2JqZWN0cxgBIAMoCzIQLmFwaS5BcHBvaW50bWVudFIHT2'
+    'JqZWN0cxIpCgZIZWFkZXIYAiABKAsyES5hcGkuUmVzdWx0SGVhZGVyUgZIZWFkZXISIgoMUXVl'
+    'cnlDb250ZXh0GAMgASgJUgxRdWVyeUNvbnRleHQ=');
+
diff --git a/lib/claimQuery.pb.dart b/lib/claimQuery.pb.dart
index c6aab987..ff86df06 100644
--- a/lib/claimQuery.pb.dart
+++ b/lib/claimQuery.pb.dart
@@ -226,7 +226,7 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -425,7 +425,7 @@ class ClaimByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(5)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
diff --git a/lib/executionflowQuery.pb.dart b/lib/executionflowQuery.pb.dart
index 7dac8d7c..0a9c84bd 100644
--- a/lib/executionflowQuery.pb.dart
+++ b/lib/executionflowQuery.pb.dart
@@ -225,7 +225,7 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(6)
   $pb.PbList<$2.BlockFilter> get blockFilters => $_getList(3);
 
diff --git a/lib/handlingunitQuery.pb.dart b/lib/handlingunitQuery.pb.dart
index fcc0a5f0..1ae3fc49 100644
--- a/lib/handlingunitQuery.pb.dart
+++ b/lib/handlingunitQuery.pb.dart
@@ -224,7 +224,7 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(7)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -423,7 +423,7 @@ class HandlingunitByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(5)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
diff --git a/lib/itemQuery.pb.dart b/lib/itemQuery.pb.dart
index 662ae485..cf7c9f89 100644
--- a/lib/itemQuery.pb.dart
+++ b/lib/itemQuery.pb.dart
@@ -227,7 +227,7 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -426,7 +426,7 @@ class ItemByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(5)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
diff --git a/lib/logger.pb.dart b/lib/logger.pb.dart
index 54990294..08a1f413 100644
--- a/lib/logger.pb.dart
+++ b/lib/logger.pb.dart
@@ -505,7 +505,7 @@ class PlatformLogFindRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 }
diff --git a/lib/movementQuery.pb.dart b/lib/movementQuery.pb.dart
index 9477b00a..a0eacfab 100644
--- a/lib/movementQuery.pb.dart
+++ b/lib/movementQuery.pb.dart
@@ -225,7 +225,7 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(7)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -424,7 +424,7 @@ class MovementByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(5)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
diff --git a/lib/orderQuery.pb.dart b/lib/orderQuery.pb.dart
index b352ee76..8850123b 100644
--- a/lib/orderQuery.pb.dart
+++ b/lib/orderQuery.pb.dart
@@ -225,7 +225,7 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -436,7 +436,7 @@ class OrderByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(7)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
diff --git a/lib/partnerQuery.pb.dart b/lib/partnerQuery.pb.dart
index b520d235..8cdb77f9 100644
--- a/lib/partnerQuery.pb.dart
+++ b/lib/partnerQuery.pb.dart
@@ -225,7 +225,7 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -424,7 +424,7 @@ class PartnerByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(7)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
diff --git a/lib/shared.pb.dart b/lib/shared.pb.dart
index dec378cf..1db95b6f 100644
--- a/lib/shared.pb.dart
+++ b/lib/shared.pb.dart
@@ -6384,6 +6384,318 @@ class EntityDefinition extends $pb.GeneratedMessage {
   void clearModelVersion() => $_clearField(8);
 }
 
+class CrossFineQuery extends $pb.GeneratedMessage {
+  factory CrossFineQuery({
+    QueryBasicHeader? header,
+    $core.Iterable<BlockFilter>? blockFilters,
+    $core.String? limitFilter,
+    $core.String? queryContext,
+    $core.Iterable<$core.String>? searchTagProjects,
+    $core.Iterable<$core.String>? searchTagUsers,
+  }) {
+    final result = create();
+    if (header != null) result.header = header;
+    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
+    if (limitFilter != null) result.limitFilter = limitFilter;
+    if (queryContext != null) result.queryContext = queryContext;
+    if (searchTagProjects != null) result.searchTagProjects.addAll(searchTagProjects);
+    if (searchTagUsers != null) result.searchTagUsers.addAll(searchTagUsers);
+    return result;
+  }
+
+  CrossFineQuery._();
+
+  factory CrossFineQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory CrossFineQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CrossFineQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOM<QueryBasicHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: QueryBasicHeader.create)
+    ..pc<BlockFilter>(2, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: BlockFilter.create)
+    ..aOS(3, _omitFieldNames ? '' : 'LimitFilter', protoName: 'LimitFilter')
+    ..aOS(4, _omitFieldNames ? '' : 'QueryContext', protoName: 'QueryContext')
+    ..pPS(5, _omitFieldNames ? '' : 'SearchTagProjects', protoName: 'SearchTagProjects')
+    ..pPS(6, _omitFieldNames ? '' : 'SearchTagUsers', protoName: 'SearchTagUsers')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFineQuery clone() => CrossFineQuery()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFineQuery copyWith(void Function(CrossFineQuery) updates) => super.copyWith((message) => updates(message as CrossFineQuery)) as CrossFineQuery;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static CrossFineQuery create() => CrossFineQuery._();
+  @$core.override
+  CrossFineQuery createEmptyInstance() => create();
+  static $pb.PbList<CrossFineQuery> createRepeated() => $pb.PbList<CrossFineQuery>();
+  @$core.pragma('dart2js:noInline')
+  static CrossFineQuery getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CrossFineQuery>(create);
+  static CrossFineQuery? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  QueryBasicHeader get header => $_getN(0);
+  @$pb.TagNumber(1)
+  set header(QueryBasicHeader value) => $_setField(1, value);
+  @$pb.TagNumber(1)
+  $core.bool hasHeader() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearHeader() => $_clearField(1);
+  @$pb.TagNumber(1)
+  QueryBasicHeader ensureHeader() => $_ensure(0);
+
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
+  @$pb.TagNumber(2)
+  $pb.PbList<BlockFilter> get blockFilters => $_getList(1);
+
+  /// Number of maximum result
+  @$pb.TagNumber(3)
+  $core.String get limitFilter => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set limitFilter($core.String value) => $_setString(2, value);
+  @$pb.TagNumber(3)
+  $core.bool hasLimitFilter() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearLimitFilter() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get queryContext => $_getSZ(3);
+  @$pb.TagNumber(4)
+  set queryContext($core.String value) => $_setString(3, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryContext() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryContext() => $_clearField(4);
+
+  @$pb.TagNumber(5)
+  $pb.PbList<$core.String> get searchTagProjects => $_getList(4);
+
+  @$pb.TagNumber(6)
+  $pb.PbList<$core.String> get searchTagUsers => $_getList(5);
+}
+
+class CrossFindByMatchQuery extends $pb.GeneratedMessage {
+  factory CrossFindByMatchQuery({
+    QueryBasicHeader? header,
+    $core.Iterable<BlockFilter>? blockFilters,
+    $core.Iterable<MatchField>? matchFields,
+    $core.Iterable<$core.String>? searchTagProjects,
+    $core.Iterable<$core.String>? searchTagUsers,
+  }) {
+    final result = create();
+    if (header != null) result.header = header;
+    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
+    if (matchFields != null) result.matchFields.addAll(matchFields);
+    if (searchTagProjects != null) result.searchTagProjects.addAll(searchTagProjects);
+    if (searchTagUsers != null) result.searchTagUsers.addAll(searchTagUsers);
+    return result;
+  }
+
+  CrossFindByMatchQuery._();
+
+  factory CrossFindByMatchQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory CrossFindByMatchQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CrossFindByMatchQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOM<QueryBasicHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: QueryBasicHeader.create)
+    ..pc<BlockFilter>(2, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: BlockFilter.create)
+    ..pc<MatchField>(3, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: MatchField.create)
+    ..pPS(4, _omitFieldNames ? '' : 'SearchTagProjects', protoName: 'SearchTagProjects')
+    ..pPS(5, _omitFieldNames ? '' : 'SearchTagUsers', protoName: 'SearchTagUsers')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFindByMatchQuery clone() => CrossFindByMatchQuery()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFindByMatchQuery copyWith(void Function(CrossFindByMatchQuery) updates) => super.copyWith((message) => updates(message as CrossFindByMatchQuery)) as CrossFindByMatchQuery;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static CrossFindByMatchQuery create() => CrossFindByMatchQuery._();
+  @$core.override
+  CrossFindByMatchQuery createEmptyInstance() => create();
+  static $pb.PbList<CrossFindByMatchQuery> createRepeated() => $pb.PbList<CrossFindByMatchQuery>();
+  @$core.pragma('dart2js:noInline')
+  static CrossFindByMatchQuery getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CrossFindByMatchQuery>(create);
+  static CrossFindByMatchQuery? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  QueryBasicHeader get header => $_getN(0);
+  @$pb.TagNumber(1)
+  set header(QueryBasicHeader value) => $_setField(1, value);
+  @$pb.TagNumber(1)
+  $core.bool hasHeader() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearHeader() => $_clearField(1);
+  @$pb.TagNumber(1)
+  QueryBasicHeader ensureHeader() => $_ensure(0);
+
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
+  @$pb.TagNumber(2)
+  $pb.PbList<BlockFilter> get blockFilters => $_getList(1);
+
+  /// MatchField list structure, for FindMatching query
+  @$pb.TagNumber(3)
+  $pb.PbList<MatchField> get matchFields => $_getList(2);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$core.String> get searchTagProjects => $_getList(3);
+
+  @$pb.TagNumber(5)
+  $pb.PbList<$core.String> get searchTagUsers => $_getList(4);
+}
+
+class CrossFindElementByMatchQuery extends $pb.GeneratedMessage {
+  factory CrossFindElementByMatchQuery({
+    QueryProjectHeader? header,
+    $core.Iterable<BlockFilter>? blockFilters,
+    MatchElementField? matchElementField,
+    EntityType? usageContextEntity,
+    $core.String? usageContextPath,
+    $core.Iterable<$core.String>? searchTagProjects,
+    $core.Iterable<$core.String>? searchTagUsers,
+  }) {
+    final result = create();
+    if (header != null) result.header = header;
+    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
+    if (matchElementField != null) result.matchElementField = matchElementField;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (searchTagProjects != null) result.searchTagProjects.addAll(searchTagProjects);
+    if (searchTagUsers != null) result.searchTagUsers.addAll(searchTagUsers);
+    return result;
+  }
+
+  CrossFindElementByMatchQuery._();
+
+  factory CrossFindElementByMatchQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory CrossFindElementByMatchQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CrossFindElementByMatchQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOM<QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: QueryProjectHeader.create)
+    ..pc<BlockFilter>(2, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: BlockFilter.create)
+    ..aOM<MatchElementField>(3, _omitFieldNames ? '' : 'MatchElementField', protoName: 'MatchElementField', subBuilder: MatchElementField.create)
+    ..e<EntityType>(4, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: EntityType.ENTITY_TYPE_UNKNOWN, valueOf: EntityType.valueOf, enumValues: EntityType.values)
+    ..aOS(5, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..pPS(6, _omitFieldNames ? '' : 'SearchTagProjects', protoName: 'SearchTagProjects')
+    ..pPS(7, _omitFieldNames ? '' : 'SearchTagUsers', protoName: 'SearchTagUsers')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFindElementByMatchQuery clone() => CrossFindElementByMatchQuery()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFindElementByMatchQuery copyWith(void Function(CrossFindElementByMatchQuery) updates) => super.copyWith((message) => updates(message as CrossFindElementByMatchQuery)) as CrossFindElementByMatchQuery;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static CrossFindElementByMatchQuery create() => CrossFindElementByMatchQuery._();
+  @$core.override
+  CrossFindElementByMatchQuery createEmptyInstance() => create();
+  static $pb.PbList<CrossFindElementByMatchQuery> createRepeated() => $pb.PbList<CrossFindElementByMatchQuery>();
+  @$core.pragma('dart2js:noInline')
+  static CrossFindElementByMatchQuery getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CrossFindElementByMatchQuery>(create);
+  static CrossFindElementByMatchQuery? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  QueryProjectHeader get header => $_getN(0);
+  @$pb.TagNumber(1)
+  set header(QueryProjectHeader value) => $_setField(1, value);
+  @$pb.TagNumber(1)
+  $core.bool hasHeader() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearHeader() => $_clearField(1);
+  @$pb.TagNumber(1)
+  QueryProjectHeader ensureHeader() => $_ensure(0);
+
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
+  @$pb.TagNumber(2)
+  $pb.PbList<BlockFilter> get blockFilters => $_getList(1);
+
+  /// MatchElementField structure, containing wanted match string, and the fields to get.
+  @$pb.TagNumber(3)
+  MatchElementField get matchElementField => $_getN(2);
+  @$pb.TagNumber(3)
+  set matchElementField(MatchElementField value) => $_setField(3, value);
+  @$pb.TagNumber(3)
+  $core.bool hasMatchElementField() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearMatchElementField() => $_clearField(3);
+  @$pb.TagNumber(3)
+  MatchElementField ensureMatchElementField() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  EntityType get usageContextEntity => $_getN(3);
+  @$pb.TagNumber(4)
+  set usageContextEntity(EntityType value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasUsageContextEntity() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearUsageContextEntity() => $_clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.String get usageContextPath => $_getSZ(4);
+  @$pb.TagNumber(5)
+  set usageContextPath($core.String value) => $_setString(4, value);
+  @$pb.TagNumber(5)
+  $core.bool hasUsageContextPath() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearUsageContextPath() => $_clearField(5);
+
+  @$pb.TagNumber(6)
+  $pb.PbList<$core.String> get searchTagProjects => $_getList(5);
+
+  @$pb.TagNumber(7)
+  $pb.PbList<$core.String> get searchTagUsers => $_getList(6);
+}
+
+class CrossFindByMatchResult extends $pb.GeneratedMessage {
+  factory CrossFindByMatchResult({
+    $core.Iterable<MatchFieldResult>? matchResults,
+  }) {
+    final result = create();
+    if (matchResults != null) result.matchResults.addAll(matchResults);
+    return result;
+  }
+
+  CrossFindByMatchResult._();
+
+  factory CrossFindByMatchResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory CrossFindByMatchResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CrossFindByMatchResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..pc<MatchFieldResult>(1, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: MatchFieldResult.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFindByMatchResult clone() => CrossFindByMatchResult()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CrossFindByMatchResult copyWith(void Function(CrossFindByMatchResult) updates) => super.copyWith((message) => updates(message as CrossFindByMatchResult)) as CrossFindByMatchResult;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static CrossFindByMatchResult create() => CrossFindByMatchResult._();
+  @$core.override
+  CrossFindByMatchResult createEmptyInstance() => create();
+  static $pb.PbList<CrossFindByMatchResult> createRepeated() => $pb.PbList<CrossFindByMatchResult>();
+  @$core.pragma('dart2js:noInline')
+  static CrossFindByMatchResult getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CrossFindByMatchResult>(create);
+  static CrossFindByMatchResult? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $pb.PbList<MatchFieldResult> get matchResults => $_getList(0);
+}
+
 
 const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
 const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/shared.pbjson.dart b/lib/shared.pbjson.dart
index 54e5380e..40377e1f 100644
--- a/lib/shared.pbjson.dart
+++ b/lib/shared.pbjson.dart
@@ -2141,3 +2141,102 @@ final $typed_data.Uint8List entityDefinitionDescriptor = $convert.base64Decode(
     'aWN0aW9uEhwKCUlzSW5kZXhlZBgGIAEoCFIJSXNJbmRleGVkEhwKCUtwaUdyb3VwcxgHIAMoCV'
     'IJS3BpR3JvdXBzEiIKDE1vZGVsVmVyc2lvbhgIIAEoDVIMTW9kZWxWZXJzaW9u');
 
+@$core.Deprecated('Use crossFineQueryDescriptor instead')
+const CrossFineQuery$json = {
+  '1': 'CrossFineQuery',
+  '2': [
+    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryBasicHeader', '8': {}, '10': 'Header'},
+    {'1': 'BlockFilters', '3': 2, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
+    {'1': 'LimitFilter', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'LimitFilter'},
+    {'1': 'QueryContext', '3': 4, '4': 1, '5': 9, '10': 'QueryContext'},
+    {'1': 'SearchTagProjects', '3': 5, '4': 3, '5': 9, '8': {}, '10': 'SearchTagProjects'},
+    {'1': 'SearchTagUsers', '3': 6, '4': 3, '5': 9, '8': {}, '10': 'SearchTagUsers'},
+  ],
+  '7': {},
+};
+
+/// Descriptor for `CrossFineQuery`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List crossFineQueryDescriptor = $convert.base64Decode(
+    'Cg5Dcm9zc0ZpbmVRdWVyeRI3CgZIZWFkZXIYASABKAsyFS5hcGkuUXVlcnlCYXNpY0hlYWRlck'
+    'II+kIFigECEAFSBkhlYWRlchI0CgxCbG9ja0ZpbHRlcnMYAiADKAsyEC5hcGkuQmxvY2tGaWx0'
+    'ZXJSDEJsb2NrRmlsdGVycxJGCgtMaW1pdEZpbHRlchgDIAEoCUIkkkEhMhhOdW1iZXIgb2YgbW'
+    'F4aW11bSByZXN1bHRKBSI1MDAiUgtMaW1pdEZpbHRlchIiCgxRdWVyeUNvbnRleHQYBCABKAlS'
+    'DFF1ZXJ5Q29udGV4dBJtChFTZWFyY2hUYWdQcm9qZWN0cxgFIAMoCUI/kkE8MiBMaXN0IG9mIH'
+    'Byb2plY3RJRCB0byBzZWFyY2ggaW50b0oYWyJwcm9qZWN0MSIsICJwcm9qZWN0MiJdUhFTZWFy'
+    'Y2hUYWdQcm9qZWN0cxJiCg5TZWFyY2hUYWdVc2VycxgGIAMoCUI6kkE3Mh1MaXN0IG9mIHVzZX'
+    'JJRCB0byBzZWFyY2ggaW50b0oWWyJ1c2VySUQxIiwgInVzZXJJRDIiXVIOU2VhcmNoVGFnVXNl'
+    'cnM6DpJBCwoJ0gEGSGVhZGVy');
+
+@$core.Deprecated('Use crossFindByMatchQueryDescriptor instead')
+const CrossFindByMatchQuery$json = {
+  '1': 'CrossFindByMatchQuery',
+  '2': [
+    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryBasicHeader', '8': {}, '10': 'Header'},
+    {'1': 'BlockFilters', '3': 2, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
+    {'1': 'MatchFields', '3': 3, '4': 3, '5': 11, '6': '.api.MatchField', '8': {}, '10': 'MatchFields'},
+    {'1': 'SearchTagProjects', '3': 4, '4': 3, '5': 9, '8': {}, '10': 'SearchTagProjects'},
+    {'1': 'SearchTagUsers', '3': 5, '4': 3, '5': 9, '8': {}, '10': 'SearchTagUsers'},
+  ],
+  '7': {},
+};
+
+/// Descriptor for `CrossFindByMatchQuery`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List crossFindByMatchQueryDescriptor = $convert.base64Decode(
+    'ChVDcm9zc0ZpbmRCeU1hdGNoUXVlcnkSNwoGSGVhZGVyGAEgASgLMhUuYXBpLlF1ZXJ5QmFzaW'
+    'NIZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISNAoMQmxvY2tGaWx0ZXJzGAIgAygLMhAuYXBpLkJs'
+    'b2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSaQoLTWF0Y2hGaWVsZHMYAyADKAsyDy5hcGkuTWF0Y2'
+    'hGaWVsZEI2kkEzMjFNYXRjaEZpZWxkIGxpc3Qgc3RydWN0dXJlLCBmb3IgRmluZE1hdGNoaW5n'
+    'IHF1ZXJ5UgtNYXRjaEZpZWxkcxJtChFTZWFyY2hUYWdQcm9qZWN0cxgEIAMoCUI/kkE8MiBMaX'
+    'N0IG9mIHByb2plY3RJRCB0byBzZWFyY2ggaW50b0oYWyJwcm9qZWN0MSIsICJwcm9qZWN0MiJd'
+    'UhFTZWFyY2hUYWdQcm9qZWN0cxJiCg5TZWFyY2hUYWdVc2VycxgFIAMoCUI6kkE3Mh1MaXN0IG'
+    '9mIHVzZXJJRCB0byBzZWFyY2ggaW50b0oWWyJ1c2VySUQxIiwgInVzZXJJRDIiXVIOU2VhcmNo'
+    'VGFnVXNlcnM6DpJBCwoJ0gEGSGVhZGVy');
+
+@$core.Deprecated('Use crossFindElementByMatchQueryDescriptor instead')
+const CrossFindElementByMatchQuery$json = {
+  '1': 'CrossFindElementByMatchQuery',
+  '2': [
+    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
+    {'1': 'BlockFilters', '3': 2, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
+    {'1': 'MatchElementField', '3': 3, '4': 1, '5': 11, '6': '.api.MatchElementField', '8': {}, '10': 'MatchElementField'},
+    {'1': 'UsageContextEntity', '3': 4, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 5, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'SearchTagProjects', '3': 6, '4': 3, '5': 9, '8': {}, '10': 'SearchTagProjects'},
+    {'1': 'SearchTagUsers', '3': 7, '4': 3, '5': 9, '8': {}, '10': 'SearchTagUsers'},
+  ],
+  '7': {},
+};
+
+/// Descriptor for `CrossFindElementByMatchQuery`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List crossFindElementByMatchQueryDescriptor = $convert.base64Decode(
+    'ChxDcm9zc0ZpbmRFbGVtZW50QnlNYXRjaFF1ZXJ5EjkKBkhlYWRlchgBIAEoCzIXLmFwaS5RdW'
+    'VyeVByb2plY3RIZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISNAoMQmxvY2tGaWx0ZXJzGAIgAygL'
+    'MhAuYXBpLkJsb2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSTgoRTWF0Y2hFbGVtZW50RmllbGQYAy'
+    'ABKAsyFi5hcGkuTWF0Y2hFbGVtZW50RmllbGRCCPpCBYoBAhABUhFNYXRjaEVsZW1lbnRGaWVs'
+    'ZBLDAgoSVXNhZ2VDb250ZXh0RW50aXR5GAQgASgOMg8uYXBpLkVudGl0eVR5cGVCgQKSQf0BMl'
+    'xPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseSB0aGUgcmVzdHJpY3Rpb24gcnVsZXMgKG9uIHRo'
+    'ZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNvbnRleHRQYXRoKUqcASJGb3IgQWN0b3IsIHRvIG'
+    'xpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaGlwRnJvbSByZXN0cmljdGlv'
+    'biBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBPcmRlciBhbmQgVXNhZ2VDb2'
+    '50ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tIlISVXNhZ2VDb250ZXh0RW50aXR5EoQBChBV'
+    'c2FnZUNvbnRleHRQYXRoGAUgASgJQliSQVUyU09wdGlvbmFsIDogUGF0aCBvZiByZXN0cmljdG'
+    'lvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleHRFbnRpdHkgc2hvdWxkIGJlIGRlZmluZWQp'
+    'UhBVc2FnZUNvbnRleHRQYXRoEm0KEVNlYXJjaFRhZ1Byb2plY3RzGAYgAygJQj+SQTwyIExpc3'
+    'Qgb2YgcHJvamVjdElEIHRvIHNlYXJjaCBpbnRvShhbInByb2plY3QxIiwgInByb2plY3QyIl1S'
+    'EVNlYXJjaFRhZ1Byb2plY3RzEmIKDlNlYXJjaFRhZ1VzZXJzGAcgAygJQjqSQTcyHUxpc3Qgb2'
+    'YgdXNlcklEIHRvIHNlYXJjaCBpbnRvShZbInVzZXJJRDEiLCAidXNlcklEMiJdUg5TZWFyY2hU'
+    'YWdVc2VyczoOkkELCgnSAQZIZWFkZXI=');
+
+@$core.Deprecated('Use crossFindByMatchResultDescriptor instead')
+const CrossFindByMatchResult$json = {
+  '1': 'CrossFindByMatchResult',
+  '2': [
+    {'1': 'MatchResults', '3': 1, '4': 3, '5': 11, '6': '.api.MatchFieldResult', '10': 'MatchResults'},
+  ],
+};
+
+/// Descriptor for `CrossFindByMatchResult`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List crossFindByMatchResultDescriptor = $convert.base64Decode(
+    'ChZDcm9zc0ZpbmRCeU1hdGNoUmVzdWx0EjkKDE1hdGNoUmVzdWx0cxgBIAMoCzIVLmFwaS5NYX'
+    'RjaEZpZWxkUmVzdWx0UgxNYXRjaFJlc3VsdHM=');
+
diff --git a/lib/stockQuery.pb.dart b/lib/stockQuery.pb.dart
index 7ad7f4f0..275c4f48 100644
--- a/lib/stockQuery.pb.dart
+++ b/lib/stockQuery.pb.dart
@@ -225,7 +225,7 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   void clearQueryContext() => $_clearField(5);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(7)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
@@ -427,7 +427,7 @@ class StockByMatchQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $1.QueryProjectHeader ensureHeader() => $_ensure(0);
 
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
+  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query
   @$pb.TagNumber(5)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 51d17bd8..fd90fa4e 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.13.0-SNAPSHOT-260223150731
+version: 1.13.0-SNAPSHOT-260223160249
 homepage: ''
 publish_to: ''
 repository: ''