diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56784240..e1f562e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # CHANGELOG
 
-Lib version: 1.15.0-SNAPSHOT-260909085816
+Lib version: 1.15.0-SNAPSHOT-260909131042
diff --git a/lib/actorQuery.pb.dart b/lib/actorQuery.pb.dart
index f24c484b..9b3ec417 100644
--- a/lib/actorQuery.pb.dart
+++ b/lib/actorQuery.pb.dart
@@ -23,12 +23,15 @@ class ActorByIdQuery extends $pb.GeneratedMessage {
   factory ActorByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     ActorQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class ActorByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<ActorQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ActorQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class ActorByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   ActorQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(ActorQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   ActorQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class ActorByIdResult extends $pb.GeneratedMessage {
   factory ActorByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$2.Actor>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class ActorByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Actor.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class ActorByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$2.Actor> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class ActorByFilterQuery extends $pb.GeneratedMessage {
@@ -147,9 +173,11 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     ActorQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -159,6 +187,7 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -175,6 +204,7 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<ActorQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ActorQueryOptions.create)
     ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(10, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -229,14 +259,19 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   ActorQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   set options(ActorQueryOptions value) => $_setField(7, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   void clearOptions() => $_clearField(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   ActorQueryOptions ensureOptions() => $_ensure(4);
 
@@ -257,6 +292,17 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(9)
   void clearUsageContextPath() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(10)
+  set queryOptions($1.QueryOptions value) => $_setField(10, value);
+  @$pb.TagNumber(10)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(10)
+  void clearQueryOptions() => $_clearField(10);
+  @$pb.TagNumber(10)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class ActorByFilterResult extends $pb.GeneratedMessage {
@@ -264,11 +310,13 @@ class ActorByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$2.Actor>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -281,6 +329,7 @@ class ActorByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Actor.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -323,6 +372,9 @@ class ActorByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class ActorQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/actorQuery.pbjson.dart b/lib/actorQuery.pbjson.dart
index 213bfd25..490243f8 100644
--- a/lib/actorQuery.pbjson.dart
+++ b/lib/actorQuery.pbjson.dart
@@ -20,7 +20,16 @@ const ActorByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.ActorQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.ActorQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,9 @@ const ActorByIdQuery$json = {
 final $typed_data.Uint8List actorByIdQueryDescriptor = $convert.base64Decode(
     'Cg5BY3RvckJ5SWRRdWVyeRI6CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZWN0SGVhZG'
     'VyQgm6gQEFigECEAFSBkhlYWRlchIvCgNJRHMYAiADKAsyEi5hcGkuUXVlcnlFbnRpdHlJREIJ'
-    'uoEBBZIBAggBUgNJRHMSMAoHT3B0aW9ucxgDIAEoCzIWLmFwaS5BY3RvclF1ZXJ5T3B0aW9uc1'
-    'IHT3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
+    'uoEBBZIBAggBUgNJRHMSNAoHT3B0aW9ucxgDIAEoCzIWLmFwaS5BY3RvclF1ZXJ5T3B0aW9uc0'
+    'ICGAFSB09wdGlvbnMSNQoMUXVlcnlPcHRpb25zGAQgASgLMhEuYXBpLlF1ZXJ5T3B0aW9uc1IM'
+    'UXVlcnlPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
 
 @$core.Deprecated('Use actorByIdResultDescriptor instead')
 const ActorByIdResult$json = {
@@ -38,6 +48,7 @@ const ActorByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Actor', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -45,8 +56,9 @@ const ActorByIdResult$json = {
 /// Descriptor for `ActorByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List actorByIdResultDescriptor = $convert.base64Decode(
     'Cg9BY3RvckJ5SWRSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYWRlclIGSG'
-    'VhZGVyEiQKB09iamVjdHMYAiADKAsyCi5hcGkuQWN0b3JSB09iamVjdHM6D5JBAgoAorsYBlJl'
-    'c3VsdA==');
+    'VhZGVyEiQKB09iamVjdHMYAiADKAsyCi5hcGkuQWN0b3JSB09iamVjdHMSQAoQVHJ1bmNhdGVk'
+    'T2JqZWN0cxgDIAMoCzIULmFwaS5UcnVuY2F0ZWRPYmplY3RSEFRydW5jYXRlZE9iamVjdHM6D5'
+    'JBAgoAorsYBlJlc3VsdA==');
 
 @$core.Deprecated('Use actorByFilterQueryDescriptor instead')
 const ActorByFilterQuery$json = {
@@ -56,9 +68,18 @@ const ActorByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.ActorQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.api.ActorQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 10, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -69,16 +90,17 @@ final $typed_data.Uint8List actorByFilterQueryDescriptor = $convert.base64Decode
     'hlYWRlckIMkkEAuoEBBYoBAhABUgZIZWFkZXISRgoLbGltaXRGaWx0ZXIYBCABKAlCJJJBITIY'
     'TnVtYmVyIG9mIG1heGltdW0gcmVzdWx0SgUiNTAwIlILbGltaXRGaWx0ZXISIgoMcXVlcnlDb2'
     '50ZXh0GAUgASgJUgxxdWVyeUNvbnRleHQSNAoMQmxvY2tGaWx0ZXJzGAYgAygLMhAuYXBpLkJs'
-    'b2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSMAoHT3B0aW9ucxgHIAEoCzIWLmFwaS5BY3RvclF1ZX'
-    'J5T3B0aW9uc1IHT3B0aW9ucxLDAgoSVXNhZ2VDb250ZXh0RW50aXR5GAggASgOMg8uYXBpLkVu'
-    'dGl0eVR5cGVCgQKSQf0BMlxPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseSB0aGUgcmVzdHJpY3'
-    'Rpb24gcnVsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNvbnRleHRQYXRoKUqc'
-    'ASJGb3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaG'
-    'lwRnJvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBP'
-    'cmRlciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tIlISVXNhZ2VDb2'
-    '50ZXh0RW50aXR5EoQBChBVc2FnZUNvbnRleHRQYXRoGAkgASgJQliSQVUyU09wdGlvbmFsIDog'
-    'UGF0aCBvZiByZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleHRFbnRpdHkgc2'
-    'hvdWxkIGJlIGRlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIBBkhlYWRlcg==');
+    'b2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSNAoHT3B0aW9ucxgHIAEoCzIWLmFwaS5BY3RvclF1ZX'
+    'J5T3B0aW9uc0ICGAFSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0eRgIIAEoDjIPLmFw'
+    'aS5FbnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYXBwbHkgdGhlIHJlc3'
+    'RyaWN0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNhZ2VDb250ZXh0UGF0'
+    'aClKnAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3JkZX'
+    'IgU2hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRpdHkg'
+    'dG8gT3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbSJSElVzYW'
+    'dlQ29udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgJIAEoCUJYkkFVMlNPcHRpb25h'
+    'bCA6IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VDb250ZXh0RW50aX'
+    'R5IHNob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aBI1CgxRdWVyeU9wdGlvbnMY'
+    'CiABKAsyES5hcGkuUXVlcnlPcHRpb25zUgxRdWVyeU9wdGlvbnM6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use actorByFilterResultDescriptor instead')
 const ActorByFilterResult$json = {
@@ -87,6 +109,7 @@ const ActorByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Actor', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -94,7 +117,8 @@ const ActorByFilterResult$json = {
 final $typed_data.Uint8List actorByFilterResultDescriptor = $convert.base64Decode(
     'ChNBY3RvckJ5RmlsdGVyUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLmFwaS5SZXN1bHRIZWFkZX'
     'JSBkhlYWRlchIkCgdPYmplY3RzGAIgAygLMgouYXBpLkFjdG9yUgdPYmplY3RzEiIKDHF1ZXJ5'
-    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');
+    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0EkAKEFRydW5jYXRlZE9iamVjdHMYBCADKAsyFC'
+    '5hcGkuVHJ1bmNhdGVkT2JqZWN0UhBUcnVuY2F0ZWRPYmplY3Rz');
 
 @$core.Deprecated('Use actorQueryOptionsDescriptor instead')
 const ActorQueryOptions$json = {
diff --git a/lib/appointmentQuery.pb.dart b/lib/appointmentQuery.pb.dart
index 2cc6d704..b0395ee6 100644
--- a/lib/appointmentQuery.pb.dart
+++ b/lib/appointmentQuery.pb.dart
@@ -23,12 +23,15 @@ class AppointmentByIdQuery extends $pb.GeneratedMessage {
   factory AppointmentByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     AppointmentQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class AppointmentByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<AppointmentQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: AppointmentQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class AppointmentByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   AppointmentQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(AppointmentQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   AppointmentQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class AppointmentByIdResult extends $pb.GeneratedMessage {
   factory AppointmentByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$3.Appointment>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class AppointmentByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Appointment>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Appointment.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class AppointmentByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$3.Appointment> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class AppointmentByFilterQuery extends $pb.GeneratedMessage {
@@ -147,9 +173,11 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     AppointmentQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -159,6 +187,7 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -175,6 +204,7 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<AppointmentQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: AppointmentQueryOptions.create)
     ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(10, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -229,14 +259,19 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   AppointmentQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   set options(AppointmentQueryOptions value) => $_setField(7, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   void clearOptions() => $_clearField(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   AppointmentQueryOptions ensureOptions() => $_ensure(4);
 
@@ -257,6 +292,17 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(9)
   void clearUsageContextPath() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(10)
+  set queryOptions($1.QueryOptions value) => $_setField(10, value);
+  @$pb.TagNumber(10)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(10)
+  void clearQueryOptions() => $_clearField(10);
+  @$pb.TagNumber(10)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class AppointmentByFilterResult extends $pb.GeneratedMessage {
@@ -264,11 +310,13 @@ class AppointmentByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$3.Appointment>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -281,6 +329,7 @@ class AppointmentByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Appointment>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Appointment.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -323,6 +372,9 @@ class AppointmentByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class AppointmentQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/appointmentQuery.pbjson.dart b/lib/appointmentQuery.pbjson.dart
index d3c98980..7a2fa493 100644
--- a/lib/appointmentQuery.pbjson.dart
+++ b/lib/appointmentQuery.pbjson.dart
@@ -20,7 +20,16 @@ const AppointmentByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.AppointmentQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.AppointmentQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,10 @@ const AppointmentByIdQuery$json = {
 final $typed_data.Uint8List appointmentByIdQueryDescriptor = $convert.base64Decode(
     'ChRBcHBvaW50bWVudEJ5SWRRdWVyeRI6CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZW'
     'N0SGVhZGVyQgm6gQEFigECEAFSBkhlYWRlchIvCgNJRHMYAiADKAsyEi5hcGkuUXVlcnlFbnRp'
-    'dHlJREIJuoEBBZIBAggBUgNJRHMSNgoHT3B0aW9ucxgDIAEoCzIcLmFwaS5BcHBvaW50bWVudF'
-    'F1ZXJ5T3B0aW9uc1IHT3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
+    'dHlJREIJuoEBBZIBAggBUgNJRHMSOgoHT3B0aW9ucxgDIAEoCzIcLmFwaS5BcHBvaW50bWVudF'
+    'F1ZXJ5T3B0aW9uc0ICGAFSB09wdGlvbnMSNQoMUXVlcnlPcHRpb25zGAQgASgLMhEuYXBpLlF1'
+    'ZXJ5T3B0aW9uc1IMUXVlcnlPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ'
+    '==');
 
 @$core.Deprecated('Use appointmentByIdResultDescriptor instead')
 const AppointmentByIdResult$json = {
@@ -38,6 +49,7 @@ const AppointmentByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Appointment', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -45,8 +57,9 @@ const AppointmentByIdResult$json = {
 /// Descriptor for `AppointmentByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List appointmentByIdResultDescriptor = $convert.base64Decode(
     'ChVBcHBvaW50bWVudEJ5SWRSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYW'
-    'RlclIGSGVhZGVyEioKB09iamVjdHMYAiADKAsyEC5hcGkuQXBwb2ludG1lbnRSB09iamVjdHM6'
-    'D5JBAgoAorsYBlJlc3VsdA==');
+    'RlclIGSGVhZGVyEioKB09iamVjdHMYAiADKAsyEC5hcGkuQXBwb2ludG1lbnRSB09iamVjdHMS'
+    'QAoQVHJ1bmNhdGVkT2JqZWN0cxgDIAMoCzIULmFwaS5UcnVuY2F0ZWRPYmplY3RSEFRydW5jYX'
+    'RlZE9iamVjdHM6D5JBAgoAorsYBlJlc3VsdA==');
 
 @$core.Deprecated('Use appointmentByFilterQueryDescriptor instead')
 const AppointmentByFilterQuery$json = {
@@ -56,9 +69,18 @@ const AppointmentByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.AppointmentQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.api.AppointmentQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 10, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -69,17 +91,18 @@ final $typed_data.Uint8List appointmentByFilterQueryDescriptor = $convert.base64
     'JvamVjdEhlYWRlckIMkkEAuoEBBYoBAhABUgZIZWFkZXISRgoLbGltaXRGaWx0ZXIYBCABKAlC'
     'JJJBITIYTnVtYmVyIG9mIG1heGltdW0gcmVzdWx0SgUiNTAwIlILbGltaXRGaWx0ZXISIgoMcX'
     'VlcnlDb250ZXh0GAUgASgJUgxxdWVyeUNvbnRleHQSNAoMQmxvY2tGaWx0ZXJzGAYgAygLMhAu'
-    'YXBpLkJsb2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSNgoHT3B0aW9ucxgHIAEoCzIcLmFwaS5BcH'
-    'BvaW50bWVudFF1ZXJ5T3B0aW9uc1IHT3B0aW9ucxLDAgoSVXNhZ2VDb250ZXh0RW50aXR5GAgg'
-    'ASgOMg8uYXBpLkVudGl0eVR5cGVCgQKSQf0BMlxPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseS'
-    'B0aGUgcmVzdHJpY3Rpb24gcnVsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNv'
-    'bnRleHRQYXRoKUqcASJGb3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZy'
-    'B0byBPcmRlciBTaGlwRnJvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4'
-    'dEVudGl0eSB0byBPcmRlciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm'
-    '9tIlISVXNhZ2VDb250ZXh0RW50aXR5EoQBChBVc2FnZUNvbnRleHRQYXRoGAkgASgJQliSQVUy'
-    'U09wdGlvbmFsIDogUGF0aCBvZiByZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbn'
-    'RleHRFbnRpdHkgc2hvdWxkIGJlIGRlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIB'
-    'BkhlYWRlcg==');
+    'YXBpLkJsb2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSOgoHT3B0aW9ucxgHIAEoCzIcLmFwaS5BcH'
+    'BvaW50bWVudFF1ZXJ5T3B0aW9uc0ICGAFSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0'
+    'eRgIIAEoDjIPLmFwaS5FbnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYX'
+    'BwbHkgdGhlIHJlc3RyaWN0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNh'
+    'Z2VDb250ZXh0UGF0aClKnAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2Nvcm'
+    'RpbmcgdG8gT3JkZXIgU2hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNv'
+    'bnRleHRFbnRpdHkgdG8gT3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaG'
+    'lwRnJvbSJSElVzYWdlQ29udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgJIAEoCUJY'
+    'kkFVMlNPcHRpb25hbCA6IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2'
+    'VDb250ZXh0RW50aXR5IHNob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aBI1CgxR'
+    'dWVyeU9wdGlvbnMYCiABKAsyES5hcGkuUXVlcnlPcHRpb25zUgxRdWVyeU9wdGlvbnM6DpJBCw'
+    'oJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use appointmentByFilterResultDescriptor instead')
 const AppointmentByFilterResult$json = {
@@ -88,6 +111,7 @@ const AppointmentByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Appointment', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -95,7 +119,8 @@ const AppointmentByFilterResult$json = {
 final $typed_data.Uint8List appointmentByFilterResultDescriptor = $convert.base64Decode(
     'ChlBcHBvaW50bWVudEJ5RmlsdGVyUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLmFwaS5SZXN1bH'
     'RIZWFkZXJSBkhlYWRlchIqCgdPYmplY3RzGAIgAygLMhAuYXBpLkFwcG9pbnRtZW50UgdPYmpl'
-    'Y3RzEiIKDHF1ZXJ5Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');
+    'Y3RzEiIKDHF1ZXJ5Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0EkAKEFRydW5jYXRlZE9iam'
+    'VjdHMYBCADKAsyFC5hcGkuVHJ1bmNhdGVkT2JqZWN0UhBUcnVuY2F0ZWRPYmplY3Rz');
 
 @$core.Deprecated('Use appointmentQueryOptionsDescriptor instead')
 const AppointmentQueryOptions$json = {
diff --git a/lib/claimQuery.pb.dart b/lib/claimQuery.pb.dart
index ff86df06..b56cee4e 100644
--- a/lib/claimQuery.pb.dart
+++ b/lib/claimQuery.pb.dart
@@ -24,12 +24,15 @@ class ClaimByIdQuery extends $pb.GeneratedMessage {
   factory ClaimByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     ClaimQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -42,6 +45,7 @@ class ClaimByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<ClaimQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ClaimQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -76,26 +80,44 @@ class ClaimByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   ClaimQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(ClaimQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   ClaimQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class ClaimByIdResult extends $pb.GeneratedMessage {
   factory ClaimByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$3.Claim>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -107,6 +129,7 @@ class ClaimByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Claim.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -140,6 +163,9 @@ class ClaimByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$3.Claim> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class ClaimByFilterQuery extends $pb.GeneratedMessage {
@@ -148,9 +174,11 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     ClaimQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -160,6 +188,7 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -176,6 +205,7 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<ClaimQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ClaimQueryOptions.create)
     ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(10, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -230,14 +260,19 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   ClaimQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   set options(ClaimQueryOptions value) => $_setField(7, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   void clearOptions() => $_clearField(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   ClaimQueryOptions ensureOptions() => $_ensure(4);
 
@@ -258,6 +293,17 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(9)
   void clearUsageContextPath() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(10)
+  set queryOptions($1.QueryOptions value) => $_setField(10, value);
+  @$pb.TagNumber(10)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(10)
+  void clearQueryOptions() => $_clearField(10);
+  @$pb.TagNumber(10)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class ClaimByFilterResult extends $pb.GeneratedMessage {
@@ -265,11 +311,13 @@ class ClaimByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$3.Claim>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -282,6 +330,7 @@ class ClaimByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Claim.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -324,6 +373,9 @@ class ClaimByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class ClaimQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/claimQuery.pbjson.dart b/lib/claimQuery.pbjson.dart
index 9c743ce1..8e883f4b 100644
--- a/lib/claimQuery.pbjson.dart
+++ b/lib/claimQuery.pbjson.dart
@@ -20,7 +20,16 @@ const ClaimByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.ClaimQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.ClaimQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,9 @@ const ClaimByIdQuery$json = {
 final $typed_data.Uint8List claimByIdQueryDescriptor = $convert.base64Decode(
     'Cg5DbGFpbUJ5SWRRdWVyeRI6CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZWN0SGVhZG'
     'VyQgm6gQEFigECEAFSBkhlYWRlchIvCgNJRHMYAiADKAsyEi5hcGkuUXVlcnlFbnRpdHlJREIJ'
-    'uoEBBZIBAggBUgNJRHMSMAoHT3B0aW9ucxgDIAEoCzIWLmFwaS5DbGFpbVF1ZXJ5T3B0aW9uc1'
-    'IHT3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
+    'uoEBBZIBAggBUgNJRHMSNAoHT3B0aW9ucxgDIAEoCzIWLmFwaS5DbGFpbVF1ZXJ5T3B0aW9uc0'
+    'ICGAFSB09wdGlvbnMSNQoMUXVlcnlPcHRpb25zGAQgASgLMhEuYXBpLlF1ZXJ5T3B0aW9uc1IM'
+    'UXVlcnlPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
 
 @$core.Deprecated('Use claimByIdResultDescriptor instead')
 const ClaimByIdResult$json = {
@@ -38,6 +48,7 @@ const ClaimByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Claim', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -45,8 +56,9 @@ const ClaimByIdResult$json = {
 /// Descriptor for `ClaimByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List claimByIdResultDescriptor = $convert.base64Decode(
     'Cg9DbGFpbUJ5SWRSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYWRlclIGSG'
-    'VhZGVyEiQKB09iamVjdHMYAiADKAsyCi5hcGkuQ2xhaW1SB09iamVjdHM6D5JBAgoAorsYBlJl'
-    'c3VsdA==');
+    'VhZGVyEiQKB09iamVjdHMYAiADKAsyCi5hcGkuQ2xhaW1SB09iamVjdHMSQAoQVHJ1bmNhdGVk'
+    'T2JqZWN0cxgDIAMoCzIULmFwaS5UcnVuY2F0ZWRPYmplY3RSEFRydW5jYXRlZE9iamVjdHM6D5'
+    'JBAgoAorsYBlJlc3VsdA==');
 
 @$core.Deprecated('Use claimByFilterQueryDescriptor instead')
 const ClaimByFilterQuery$json = {
@@ -56,9 +68,18 @@ const ClaimByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.ClaimQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.api.ClaimQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 10, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -69,16 +90,17 @@ final $typed_data.Uint8List claimByFilterQueryDescriptor = $convert.base64Decode
     'hlYWRlckIMkkEAuoEBBYoBAhABUgZIZWFkZXISRgoLbGltaXRGaWx0ZXIYBCABKAlCJJJBITIY'
     'TnVtYmVyIG9mIG1heGltdW0gcmVzdWx0SgUiNTAwIlILbGltaXRGaWx0ZXISIgoMcXVlcnlDb2'
     '50ZXh0GAUgASgJUgxxdWVyeUNvbnRleHQSNAoMQmxvY2tGaWx0ZXJzGAYgAygLMhAuYXBpLkJs'
-    'b2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSMAoHT3B0aW9ucxgHIAEoCzIWLmFwaS5DbGFpbVF1ZX'
-    'J5T3B0aW9uc1IHT3B0aW9ucxLDAgoSVXNhZ2VDb250ZXh0RW50aXR5GAggASgOMg8uYXBpLkVu'
-    'dGl0eVR5cGVCgQKSQf0BMlxPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseSB0aGUgcmVzdHJpY3'
-    'Rpb24gcnVsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNvbnRleHRQYXRoKUqc'
-    'ASJGb3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaG'
-    'lwRnJvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBP'
-    'cmRlciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tIlISVXNhZ2VDb2'
-    '50ZXh0RW50aXR5EoQBChBVc2FnZUNvbnRleHRQYXRoGAkgASgJQliSQVUyU09wdGlvbmFsIDog'
-    'UGF0aCBvZiByZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleHRFbnRpdHkgc2'
-    'hvdWxkIGJlIGRlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIBBkhlYWRlcg==');
+    'b2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSNAoHT3B0aW9ucxgHIAEoCzIWLmFwaS5DbGFpbVF1ZX'
+    'J5T3B0aW9uc0ICGAFSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0eRgIIAEoDjIPLmFw'
+    'aS5FbnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYXBwbHkgdGhlIHJlc3'
+    'RyaWN0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNhZ2VDb250ZXh0UGF0'
+    'aClKnAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3JkZX'
+    'IgU2hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRpdHkg'
+    'dG8gT3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbSJSElVzYW'
+    'dlQ29udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgJIAEoCUJYkkFVMlNPcHRpb25h'
+    'bCA6IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VDb250ZXh0RW50aX'
+    'R5IHNob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aBI1CgxRdWVyeU9wdGlvbnMY'
+    'CiABKAsyES5hcGkuUXVlcnlPcHRpb25zUgxRdWVyeU9wdGlvbnM6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use claimByFilterResultDescriptor instead')
 const ClaimByFilterResult$json = {
@@ -87,6 +109,7 @@ const ClaimByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Claim', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -94,7 +117,8 @@ const ClaimByFilterResult$json = {
 final $typed_data.Uint8List claimByFilterResultDescriptor = $convert.base64Decode(
     'ChNDbGFpbUJ5RmlsdGVyUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLmFwaS5SZXN1bHRIZWFkZX'
     'JSBkhlYWRlchIkCgdPYmplY3RzGAIgAygLMgouYXBpLkNsYWltUgdPYmplY3RzEiIKDHF1ZXJ5'
-    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');
+    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0EkAKEFRydW5jYXRlZE9iamVjdHMYBCADKAsyFC'
+    '5hcGkuVHJ1bmNhdGVkT2JqZWN0UhBUcnVuY2F0ZWRPYmplY3Rz');
 
 @$core.Deprecated('Use claimQueryOptionsDescriptor instead')
 const ClaimQueryOptions$json = {
diff --git a/lib/executionflowQuery.pb.dart b/lib/executionflowQuery.pb.dart
index 0a9c84bd..3111365c 100644
--- a/lib/executionflowQuery.pb.dart
+++ b/lib/executionflowQuery.pb.dart
@@ -23,12 +23,15 @@ class ExecutionflowByIdQuery extends $pb.GeneratedMessage {
   factory ExecutionflowByIdQuery({
     $2.QueryProjectHeader? header,
     $core.Iterable<$2.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     ExecutionflowQueryOptions? options,
+    $2.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class ExecutionflowByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$2.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $2.QueryProjectHeader.create)
     ..pc<$2.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $2.QueryEntityID.create)
     ..aOM<ExecutionflowQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ExecutionflowQueryOptions.create)
+    ..aOM<$2.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $2.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class ExecutionflowByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$2.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   ExecutionflowQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(ExecutionflowQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   ExecutionflowQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $2.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($2.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $2.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class ExecutionflowByIdResult extends $pb.GeneratedMessage {
   factory ExecutionflowByIdResult({
     $2.ResultHeader? header,
     $core.Iterable<$3.Executionflow>? objects,
+    $core.Iterable<$2.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class ExecutionflowByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ExecutionflowByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$2.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $2.ResultHeader.create)
     ..pc<$3.Executionflow>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Executionflow.create)
+    ..pc<$2.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $2.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class ExecutionflowByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$3.Executionflow> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$2.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
@@ -147,9 +173,11 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$2.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     ExecutionflowQueryOptions? options,
     $2.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $2.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -159,6 +187,7 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -175,6 +204,7 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<ExecutionflowQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ExecutionflowQueryOptions.create)
     ..e<$2.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $2.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $2.EntityType.valueOf, enumValues: $2.EntityType.values)
     ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$2.QueryOptions>(10, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $2.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -229,14 +259,19 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $pb.PbList<$2.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   ExecutionflowQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   set options(ExecutionflowQueryOptions value) => $_setField(7, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   void clearOptions() => $_clearField(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   ExecutionflowQueryOptions ensureOptions() => $_ensure(4);
 
@@ -257,6 +292,17 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(9)
   void clearUsageContextPath() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $2.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(10)
+  set queryOptions($2.QueryOptions value) => $_setField(10, value);
+  @$pb.TagNumber(10)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(10)
+  void clearQueryOptions() => $_clearField(10);
+  @$pb.TagNumber(10)
+  $2.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class ExecutionflowByFilterResult extends $pb.GeneratedMessage {
@@ -264,11 +310,13 @@ class ExecutionflowByFilterResult extends $pb.GeneratedMessage {
     $2.ResultHeader? header,
     $core.Iterable<$3.Executionflow>? objects,
     $core.String? queryContext,
+    $core.Iterable<$2.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -281,6 +329,7 @@ class ExecutionflowByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$2.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $2.ResultHeader.create)
     ..pc<$3.Executionflow>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Executionflow.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$2.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $2.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -323,6 +372,9 @@ class ExecutionflowByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$2.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class ExecutionflowQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/executionflowQuery.pbjson.dart b/lib/executionflowQuery.pbjson.dart
index 2ddfc3c2..27fcc012 100644
--- a/lib/executionflowQuery.pbjson.dart
+++ b/lib/executionflowQuery.pbjson.dart
@@ -20,7 +20,16 @@ const ExecutionflowByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.ExecutionflowQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.ExecutionflowQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,10 @@ const ExecutionflowByIdQuery$json = {
 final $typed_data.Uint8List executionflowByIdQueryDescriptor = $convert.base64Decode(
     'ChZFeGVjdXRpb25mbG93QnlJZFF1ZXJ5EjoKBkhlYWRlchgBIAEoCzIXLmFwaS5RdWVyeVByb2'
     'plY3RIZWFkZXJCCbqBAQWKAQIQAVIGSGVhZGVyEi8KA0lEcxgCIAMoCzISLmFwaS5RdWVyeUVu'
-    'dGl0eUlEQgm6gQEFkgECCAFSA0lEcxI4CgdPcHRpb25zGAMgASgLMh4uYXBpLkV4ZWN1dGlvbm'
-    'Zsb3dRdWVyeU9wdGlvbnNSB09wdGlvbnM6HZJBEQoP0gEGSGVhZGVy0gEDSURzorsYBVF1ZXJ5');
+    'dGl0eUlEQgm6gQEFkgECCAFSA0lEcxI8CgdPcHRpb25zGAMgASgLMh4uYXBpLkV4ZWN1dGlvbm'
+    'Zsb3dRdWVyeU9wdGlvbnNCAhgBUgdPcHRpb25zEjUKDFF1ZXJ5T3B0aW9ucxgEIAEoCzIRLmFw'
+    'aS5RdWVyeU9wdGlvbnNSDFF1ZXJ5T3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUX'
+    'Vlcnk=');
 
 @$core.Deprecated('Use executionflowByIdResultDescriptor instead')
 const ExecutionflowByIdResult$json = {
@@ -38,6 +49,7 @@ const ExecutionflowByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Executionflow', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -46,7 +58,8 @@ const ExecutionflowByIdResult$json = {
 final $typed_data.Uint8List executionflowByIdResultDescriptor = $convert.base64Decode(
     'ChdFeGVjdXRpb25mbG93QnlJZFJlc3VsdBIpCgZIZWFkZXIYASABKAsyES5hcGkuUmVzdWx0SG'
     'VhZGVyUgZIZWFkZXISLAoHT2JqZWN0cxgCIAMoCzISLmFwaS5FeGVjdXRpb25mbG93UgdPYmpl'
-    'Y3RzOgqiuxgGUmVzdWx0');
+    'Y3RzEkAKEFRydW5jYXRlZE9iamVjdHMYAyADKAsyFC5hcGkuVHJ1bmNhdGVkT2JqZWN0UhBUcn'
+    'VuY2F0ZWRPYmplY3RzOgqiuxgGUmVzdWx0');
 
 @$core.Deprecated('Use executionflowByFilterQueryDescriptor instead')
 const ExecutionflowByFilterQuery$json = {
@@ -56,9 +69,18 @@ const ExecutionflowByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.ExecutionflowQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.api.ExecutionflowQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 10, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -69,17 +91,18 @@ final $typed_data.Uint8List executionflowByFilterQueryDescriptor = $convert.base
     'lQcm9qZWN0SGVhZGVyQgm6gQEFigECEAFSBkhlYWRlchJGCgtsaW1pdEZpbHRlchgEIAEoCUIk'
     'kkEhMhhOdW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdW'
     'VyeUNvbnRleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5h'
-    'cGkuQmxvY2tGaWx0ZXJSDEJsb2NrRmlsdGVycxI4CgdPcHRpb25zGAcgASgLMh4uYXBpLkV4ZW'
-    'N1dGlvbmZsb3dRdWVyeU9wdGlvbnNSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0eRgI'
-    'IAEoDjIPLmFwaS5FbnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYXBwbH'
-    'kgdGhlIHJlc3RyaWN0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNhZ2VD'
-    'b250ZXh0UGF0aClKnAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbm'
-    'cgdG8gT3JkZXIgU2hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRl'
-    'eHRFbnRpdHkgdG8gT3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRn'
-    'JvbSJSElVzYWdlQ29udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgJIAEoCUJYkkFV'
-    'MlNPcHRpb25hbCA6IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VDb2'
-    '50ZXh0RW50aXR5IHNob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aDoOkkELCgnS'
-    'AQZIZWFkZXI=');
+    'cGkuQmxvY2tGaWx0ZXJSDEJsb2NrRmlsdGVycxI8CgdPcHRpb25zGAcgASgLMh4uYXBpLkV4ZW'
+    'N1dGlvbmZsb3dRdWVyeU9wdGlvbnNCAhgBUgdPcHRpb25zEsMCChJVc2FnZUNvbnRleHRFbnRp'
+    'dHkYCCABKA4yDy5hcGkuRW50aXR5VHlwZUKBApJB/QEyXE9wdGlvbmFsIDogRW50aXR5IHRvIG'
+    'FwcGx5IHRoZSByZXN0cmljdGlvbiBydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVz'
+    'YWdlQ29udGV4dFBhdGgpSpwBIkZvciBBY3RvciwgdG8gbGltaXQgdGhlIHJlc3VsdHMgYWNjb3'
+    'JkaW5nIHRvIE9yZGVyIFNoaXBGcm9tIHJlc3RyaWN0aW9uIHJ1bGVzLCBkZWZpbmUgVXNhZ2VD'
+    'b250ZXh0RW50aXR5IHRvIE9yZGVyIGFuZCBVc2FnZUNvbnRleHRQYXRoIHRvIFBheWxvYWQuU2'
+    'hpcEZyb20iUhJVc2FnZUNvbnRleHRFbnRpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCSABKAlC'
+    'WJJBVTJTT3B0aW9uYWwgOiBQYXRoIG9mIHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYW'
+    'dlQ29udGV4dEVudGl0eSBzaG91bGQgYmUgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGgSNQoM'
+    'UXVlcnlPcHRpb25zGAogASgLMhEuYXBpLlF1ZXJ5T3B0aW9uc1IMUXVlcnlPcHRpb25zOg6SQQ'
+    'sKCdIBBkhlYWRlcg==');
 
 @$core.Deprecated('Use executionflowByFilterResultDescriptor instead')
 const ExecutionflowByFilterResult$json = {
@@ -88,6 +111,7 @@ const ExecutionflowByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Executionflow', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -95,7 +119,8 @@ const ExecutionflowByFilterResult$json = {
 final $typed_data.Uint8List executionflowByFilterResultDescriptor = $convert.base64Decode(
     'ChtFeGVjdXRpb25mbG93QnlGaWx0ZXJSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3'
     'VsdEhlYWRlclIGSGVhZGVyEiwKB09iamVjdHMYAiADKAsyEi5hcGkuRXhlY3V0aW9uZmxvd1IH'
-    'T2JqZWN0cxIiCgxxdWVyeUNvbnRleHQYAyABKAlSDHF1ZXJ5Q29udGV4dA==');
+    'T2JqZWN0cxIiCgxxdWVyeUNvbnRleHQYAyABKAlSDHF1ZXJ5Q29udGV4dBJAChBUcnVuY2F0ZW'
+    'RPYmplY3RzGAQgAygLMhQuYXBpLlRydW5jYXRlZE9iamVjdFIQVHJ1bmNhdGVkT2JqZWN0cw==');
 
 @$core.Deprecated('Use executionflowQueryOptionsDescriptor instead')
 const ExecutionflowQueryOptions$json = {
diff --git a/lib/handlingunitQuery.pb.dart b/lib/handlingunitQuery.pb.dart
index 1ae3fc49..e8bc537b 100644
--- a/lib/handlingunitQuery.pb.dart
+++ b/lib/handlingunitQuery.pb.dart
@@ -23,12 +23,15 @@ class HandlingunitByIdQuery extends $pb.GeneratedMessage {
   factory HandlingunitByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     HandlingunitQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class HandlingunitByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<HandlingunitQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: HandlingunitQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class HandlingunitByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   HandlingunitQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(HandlingunitQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   HandlingunitQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class HandlingunitByIdResult extends $pb.GeneratedMessage {
   factory HandlingunitByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$3.Handlingunit>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class HandlingunitByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'HandlingunitByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Handlingunit>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Handlingunit.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class HandlingunitByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$3.Handlingunit> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
@@ -147,9 +173,11 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     HandlingunitQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -159,6 +187,7 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -175,6 +204,7 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<HandlingunitQueryOptions>(8, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: HandlingunitQueryOptions.create)
     ..e<$1.EntityType>(9, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(10, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(11, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -228,14 +258,19 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   HandlingunitQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   set options(HandlingunitQueryOptions value) => $_setField(8, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   void clearOptions() => $_clearField(8);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   HandlingunitQueryOptions ensureOptions() => $_ensure(4);
 
@@ -256,6 +291,17 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(10)
   void clearUsageContextPath() => $_clearField(10);
+
+  @$pb.TagNumber(11)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(11)
+  set queryOptions($1.QueryOptions value) => $_setField(11, value);
+  @$pb.TagNumber(11)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(11)
+  void clearQueryOptions() => $_clearField(11);
+  @$pb.TagNumber(11)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class HandlingunitByFilterResult extends $pb.GeneratedMessage {
@@ -263,11 +309,13 @@ class HandlingunitByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$3.Handlingunit>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -280,6 +328,7 @@ class HandlingunitByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Handlingunit>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Handlingunit.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -322,6 +371,9 @@ class HandlingunitByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class HandlingunitQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/handlingunitQuery.pbjson.dart b/lib/handlingunitQuery.pbjson.dart
index 0b90a723..0f935add 100644
--- a/lib/handlingunitQuery.pbjson.dart
+++ b/lib/handlingunitQuery.pbjson.dart
@@ -20,7 +20,16 @@ const HandlingunitByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.HandlingunitQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.HandlingunitQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,10 @@ const HandlingunitByIdQuery$json = {
 final $typed_data.Uint8List handlingunitByIdQueryDescriptor = $convert.base64Decode(
     'ChVIYW5kbGluZ3VuaXRCeUlkUXVlcnkSOgoGSGVhZGVyGAEgASgLMhcuYXBpLlF1ZXJ5UHJvam'
     'VjdEhlYWRlckIJuoEBBYoBAhABUgZIZWFkZXISLwoDSURzGAIgAygLMhIuYXBpLlF1ZXJ5RW50'
-    'aXR5SURCCbqBAQWSAQIIAVIDSURzEjcKB09wdGlvbnMYAyABKAsyHS5hcGkuSGFuZGxpbmd1bm'
-    'l0UXVlcnlPcHRpb25zUgdPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
+    'aXR5SURCCbqBAQWSAQIIAVIDSURzEjsKB09wdGlvbnMYAyABKAsyHS5hcGkuSGFuZGxpbmd1bm'
+    'l0UXVlcnlPcHRpb25zQgIYAVIHT3B0aW9ucxI1CgxRdWVyeU9wdGlvbnMYBCABKAsyES5hcGku'
+    'UXVlcnlPcHRpb25zUgxRdWVyeU9wdGlvbnM6HZJBEQoP0gEGSGVhZGVy0gEDSURzorsYBVF1ZX'
+    'J5');
 
 @$core.Deprecated('Use handlingunitByIdResultDescriptor instead')
 const HandlingunitByIdResult$json = {
@@ -38,6 +49,7 @@ const HandlingunitByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Handlingunit', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -46,7 +58,8 @@ const HandlingunitByIdResult$json = {
 final $typed_data.Uint8List handlingunitByIdResultDescriptor = $convert.base64Decode(
     'ChZIYW5kbGluZ3VuaXRCeUlkUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLmFwaS5SZXN1bHRIZW'
     'FkZXJSBkhlYWRlchIrCgdPYmplY3RzGAIgAygLMhEuYXBpLkhhbmRsaW5ndW5pdFIHT2JqZWN0'
-    'czoKorsYBlJlc3VsdA==');
+    'cxJAChBUcnVuY2F0ZWRPYmplY3RzGAMgAygLMhQuYXBpLlRydW5jYXRlZE9iamVjdFIQVHJ1bm'
+    'NhdGVkT2JqZWN0czoKorsYBlJlc3VsdA==');
 
 @$core.Deprecated('Use handlingunitByFilterQueryDescriptor instead')
 const HandlingunitByFilterQuery$json = {
@@ -56,9 +69,18 @@ const HandlingunitByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 7, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 8, '4': 1, '5': 11, '6': '.api.HandlingunitQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 8,
+      '4': 1,
+      '5': 11,
+      '6': '.api.HandlingunitQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 9, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 10, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 11, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
 };
 
@@ -67,16 +89,17 @@ final $typed_data.Uint8List handlingunitByFilterQueryDescriptor = $convert.base6
     'ChlIYW5kbGluZ3VuaXRCeUZpbHRlclF1ZXJ5Ei8KBkhlYWRlchgBIAEoCzIXLmFwaS5RdWVyeV'
     'Byb2plY3RIZWFkZXJSBkhlYWRlchIgCgtsaW1pdEZpbHRlchgEIAEoCVILbGltaXRGaWx0ZXIS'
     'IgoMcXVlcnlDb250ZXh0GAUgASgJUgxxdWVyeUNvbnRleHQSNAoMQmxvY2tGaWx0ZXJzGAcgAy'
-    'gLMhAuYXBpLkJsb2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSNwoHT3B0aW9ucxgIIAEoCzIdLmFw'
-    'aS5IYW5kbGluZ3VuaXRRdWVyeU9wdGlvbnNSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudG'
-    'l0eRgJIAEoDjIPLmFwaS5FbnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8g'
-    'YXBwbHkgdGhlIHJlc3RyaWN0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVX'
-    'NhZ2VDb250ZXh0UGF0aClKnAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2Nv'
-    'cmRpbmcgdG8gT3JkZXIgU2hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZU'
-    'NvbnRleHRFbnRpdHkgdG8gT3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5T'
-    'aGlwRnJvbSJSElVzYWdlQ29udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgKIAEoCU'
-    'JYkkFVMlNPcHRpb25hbCA6IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNh'
-    'Z2VDb250ZXh0RW50aXR5IHNob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aA==');
+    'gLMhAuYXBpLkJsb2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSOwoHT3B0aW9ucxgIIAEoCzIdLmFw'
+    'aS5IYW5kbGluZ3VuaXRRdWVyeU9wdGlvbnNCAhgBUgdPcHRpb25zEsMCChJVc2FnZUNvbnRleH'
+    'RFbnRpdHkYCSABKA4yDy5hcGkuRW50aXR5VHlwZUKBApJB/QEyXE9wdGlvbmFsIDogRW50aXR5'
+    'IHRvIGFwcGx5IHRoZSByZXN0cmljdGlvbiBydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aX'
+    'RoIFVzYWdlQ29udGV4dFBhdGgpSpwBIkZvciBBY3RvciwgdG8gbGltaXQgdGhlIHJlc3VsdHMg'
+    'YWNjb3JkaW5nIHRvIE9yZGVyIFNoaXBGcm9tIHJlc3RyaWN0aW9uIHJ1bGVzLCBkZWZpbmUgVX'
+    'NhZ2VDb250ZXh0RW50aXR5IHRvIE9yZGVyIGFuZCBVc2FnZUNvbnRleHRQYXRoIHRvIFBheWxv'
+    'YWQuU2hpcEZyb20iUhJVc2FnZUNvbnRleHRFbnRpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCi'
+    'ABKAlCWJJBVTJTT3B0aW9uYWwgOiBQYXRoIG9mIHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkg'
+    'KFVzYWdlQ29udGV4dEVudGl0eSBzaG91bGQgYmUgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdG'
+    'gSNQoMUXVlcnlPcHRpb25zGAsgASgLMhEuYXBpLlF1ZXJ5T3B0aW9uc1IMUXVlcnlPcHRpb25z');
 
 @$core.Deprecated('Use handlingunitByFilterResultDescriptor instead')
 const HandlingunitByFilterResult$json = {
@@ -85,6 +108,7 @@ const HandlingunitByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Handlingunit', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -92,7 +116,8 @@ const HandlingunitByFilterResult$json = {
 final $typed_data.Uint8List handlingunitByFilterResultDescriptor = $convert.base64Decode(
     'ChpIYW5kbGluZ3VuaXRCeUZpbHRlclJlc3VsdBIpCgZIZWFkZXIYASABKAsyES5hcGkuUmVzdW'
     'x0SGVhZGVyUgZIZWFkZXISKwoHT2JqZWN0cxgCIAMoCzIRLmFwaS5IYW5kbGluZ3VuaXRSB09i'
-    'amVjdHMSIgoMcXVlcnlDb250ZXh0GAMgASgJUgxxdWVyeUNvbnRleHQ=');
+    'amVjdHMSIgoMcXVlcnlDb250ZXh0GAMgASgJUgxxdWVyeUNvbnRleHQSQAoQVHJ1bmNhdGVkT2'
+    'JqZWN0cxgEIAMoCzIULmFwaS5UcnVuY2F0ZWRPYmplY3RSEFRydW5jYXRlZE9iamVjdHM=');
 
 @$core.Deprecated('Use handlingunitQueryOptionsDescriptor instead')
 const HandlingunitQueryOptions$json = {
diff --git a/lib/itemQuery.pb.dart b/lib/itemQuery.pb.dart
index cf7c9f89..d1268fbf 100644
--- a/lib/itemQuery.pb.dart
+++ b/lib/itemQuery.pb.dart
@@ -24,12 +24,15 @@ class ItemByIdQuery extends $pb.GeneratedMessage {
   factory ItemByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     ItemQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -42,6 +45,7 @@ class ItemByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<ItemQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ItemQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -76,26 +80,44 @@ class ItemByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   ItemQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(ItemQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   ItemQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class ItemByIdResult extends $pb.GeneratedMessage {
   factory ItemByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$2.Item>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -107,6 +129,7 @@ class ItemByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ItemByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Item>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Item.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -141,6 +164,9 @@ class ItemByIdResult extends $pb.GeneratedMessage {
   /// Aggregation object message
   @$pb.TagNumber(2)
   $pb.PbList<$2.Item> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class ItemByFilterQuery extends $pb.GeneratedMessage {
@@ -149,9 +175,11 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     ItemQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -161,6 +189,7 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -177,6 +206,7 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<ItemQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ItemQueryOptions.create)
     ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(10, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -231,14 +261,19 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   ItemQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   set options(ItemQueryOptions value) => $_setField(7, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   void clearOptions() => $_clearField(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   ItemQueryOptions ensureOptions() => $_ensure(4);
 
@@ -259,6 +294,17 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(9)
   void clearUsageContextPath() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(10)
+  set queryOptions($1.QueryOptions value) => $_setField(10, value);
+  @$pb.TagNumber(10)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(10)
+  void clearQueryOptions() => $_clearField(10);
+  @$pb.TagNumber(10)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class ItemByFilterResult extends $pb.GeneratedMessage {
@@ -266,11 +312,13 @@ class ItemByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$2.Item>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -283,6 +331,7 @@ class ItemByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Item>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Item.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -325,6 +374,9 @@ class ItemByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class ItemQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/itemQuery.pbjson.dart b/lib/itemQuery.pbjson.dart
index 44c34d13..d8bdc035 100644
--- a/lib/itemQuery.pbjson.dart
+++ b/lib/itemQuery.pbjson.dart
@@ -20,7 +20,16 @@ const ItemByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.ItemQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.ItemQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,9 @@ const ItemByIdQuery$json = {
 final $typed_data.Uint8List itemByIdQueryDescriptor = $convert.base64Decode(
     'Cg1JdGVtQnlJZFF1ZXJ5EjoKBkhlYWRlchgBIAEoCzIXLmFwaS5RdWVyeVByb2plY3RIZWFkZX'
     'JCCbqBAQWKAQIQAVIGSGVhZGVyEi8KA0lEcxgCIAMoCzISLmFwaS5RdWVyeUVudGl0eUlEQgm6'
-    'gQEFkgECCAFSA0lEcxIvCgdPcHRpb25zGAMgASgLMhUuYXBpLkl0ZW1RdWVyeU9wdGlvbnNSB0'
-    '9wdGlvbnM6HZJBEQoP0gEGSGVhZGVy0gEDSURzorsYBVF1ZXJ5');
+    'gQEFkgECCAFSA0lEcxIzCgdPcHRpb25zGAMgASgLMhUuYXBpLkl0ZW1RdWVyeU9wdGlvbnNCAh'
+    'gBUgdPcHRpb25zEjUKDFF1ZXJ5T3B0aW9ucxgEIAEoCzIRLmFwaS5RdWVyeU9wdGlvbnNSDFF1'
+    'ZXJ5T3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
 
 @$core.Deprecated('Use itemByIdResultDescriptor instead')
 const ItemByIdResult$json = {
@@ -38,6 +48,7 @@ const ItemByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Item', '8': {}, '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -46,7 +57,8 @@ const ItemByIdResult$json = {
 final $typed_data.Uint8List itemByIdResultDescriptor = $convert.base64Decode(
     'Cg5JdGVtQnlJZFJlc3VsdBIpCgZIZWFkZXIYASABKAsyES5hcGkuUmVzdWx0SGVhZGVyUgZIZW'
     'FkZXISRAoHT2JqZWN0cxgCIAMoCzIJLmFwaS5JdGVtQh+SQRwyGkFnZ3JlZ2F0aW9uIG9iamVj'
-    'dCBtZXNzYWdlUgdPYmplY3RzOgqiuxgGUmVzdWx0');
+    'dCBtZXNzYWdlUgdPYmplY3RzEkAKEFRydW5jYXRlZE9iamVjdHMYAyADKAsyFC5hcGkuVHJ1bm'
+    'NhdGVkT2JqZWN0UhBUcnVuY2F0ZWRPYmplY3RzOgqiuxgGUmVzdWx0');
 
 @$core.Deprecated('Use itemByFilterQueryDescriptor instead')
 const ItemByFilterQuery$json = {
@@ -56,9 +68,18 @@ const ItemByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.ItemQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.api.ItemQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 10, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -69,16 +90,17 @@ final $typed_data.Uint8List itemByFilterQueryDescriptor = $convert.base64Decode(
     'VhZGVyQgm6gQEFigECEAFSBkhlYWRlchJGCgtsaW1pdEZpbHRlchgEIAEoCUIkkkEhMhhOdW1i'
     'ZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbnRleH'
     'QYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGkuQmxvY2tG'
-    'aWx0ZXJSDEJsb2NrRmlsdGVycxIvCgdPcHRpb25zGAcgASgLMhUuYXBpLkl0ZW1RdWVyeU9wdG'
-    'lvbnNSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0eRgIIAEoDjIPLmFwaS5FbnRpdHlU'
-    'eXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYXBwbHkgdGhlIHJlc3RyaWN0aW9uIH'
-    'J1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNhZ2VDb250ZXh0UGF0aClKnAEiRm9y'
-    'IEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3JkZXIgU2hpcEZyb2'
-    '0gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRpdHkgdG8gT3JkZXIg'
-    'YW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbSJSElVzYWdlQ29udGV4dE'
-    'VudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgJIAEoCUJYkkFVMlNPcHRpb25hbCA6IFBhdGgg'
-    'b2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VDb250ZXh0RW50aXR5IHNob3VsZC'
-    'BiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aDoOkkELCgnSAQZIZWFkZXI=');
+    'aWx0ZXJSDEJsb2NrRmlsdGVycxIzCgdPcHRpb25zGAcgASgLMhUuYXBpLkl0ZW1RdWVyeU9wdG'
+    'lvbnNCAhgBUgdPcHRpb25zEsMCChJVc2FnZUNvbnRleHRFbnRpdHkYCCABKA4yDy5hcGkuRW50'
+    'aXR5VHlwZUKBApJB/QEyXE9wdGlvbmFsIDogRW50aXR5IHRvIGFwcGx5IHRoZSByZXN0cmljdG'
+    'lvbiBydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVzYWdlQ29udGV4dFBhdGgpSpwB'
+    'IkZvciBBY3RvciwgdG8gbGltaXQgdGhlIHJlc3VsdHMgYWNjb3JkaW5nIHRvIE9yZGVyIFNoaX'
+    'BGcm9tIHJlc3RyaWN0aW9uIHJ1bGVzLCBkZWZpbmUgVXNhZ2VDb250ZXh0RW50aXR5IHRvIE9y'
+    'ZGVyIGFuZCBVc2FnZUNvbnRleHRQYXRoIHRvIFBheWxvYWQuU2hpcEZyb20iUhJVc2FnZUNvbn'
+    'RleHRFbnRpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCSABKAlCWJJBVTJTT3B0aW9uYWwgOiBQ'
+    'YXRoIG9mIHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYWdlQ29udGV4dEVudGl0eSBzaG'
+    '91bGQgYmUgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGgSNQoMUXVlcnlPcHRpb25zGAogASgL'
+    'MhEuYXBpLlF1ZXJ5T3B0aW9uc1IMUXVlcnlPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
 
 @$core.Deprecated('Use itemByFilterResultDescriptor instead')
 const ItemByFilterResult$json = {
@@ -87,6 +109,7 @@ const ItemByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Item', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -94,7 +117,8 @@ const ItemByFilterResult$json = {
 final $typed_data.Uint8List itemByFilterResultDescriptor = $convert.base64Decode(
     'ChJJdGVtQnlGaWx0ZXJSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYWRlcl'
     'IGSGVhZGVyEiMKB09iamVjdHMYAiADKAsyCS5hcGkuSXRlbVIHT2JqZWN0cxIiCgxxdWVyeUNv'
-    'bnRleHQYAyABKAlSDHF1ZXJ5Q29udGV4dA==');
+    'bnRleHQYAyABKAlSDHF1ZXJ5Q29udGV4dBJAChBUcnVuY2F0ZWRPYmplY3RzGAQgAygLMhQuYX'
+    'BpLlRydW5jYXRlZE9iamVjdFIQVHJ1bmNhdGVkT2JqZWN0cw==');
 
 @$core.Deprecated('Use itemQueryOptionsDescriptor instead')
 const ItemQueryOptions$json = {
diff --git a/lib/movementQuery.pb.dart b/lib/movementQuery.pb.dart
index a0eacfab..09d23670 100644
--- a/lib/movementQuery.pb.dart
+++ b/lib/movementQuery.pb.dart
@@ -23,12 +23,15 @@ class MovementByIdQuery extends $pb.GeneratedMessage {
   factory MovementByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     MovementQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class MovementByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<MovementQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: MovementQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class MovementByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   MovementQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(MovementQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   MovementQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class MovementByIdResult extends $pb.GeneratedMessage {
   factory MovementByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$3.Movement>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class MovementByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MovementByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Movement>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Movement.create)
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class MovementByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$3.Movement> get objects => $_getList(1);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class MovementByFilterQuery extends $pb.GeneratedMessage {
@@ -147,9 +173,11 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     MovementQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -159,6 +187,7 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -175,6 +204,7 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<MovementQueryOptions>(8, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: MovementQueryOptions.create)
     ..e<$1.EntityType>(9, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(10, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(11, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -229,14 +259,19 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   MovementQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   set options(MovementQueryOptions value) => $_setField(8, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   void clearOptions() => $_clearField(8);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   MovementQueryOptions ensureOptions() => $_ensure(4);
 
@@ -257,6 +292,17 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(10)
   void clearUsageContextPath() => $_clearField(10);
+
+  @$pb.TagNumber(11)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(11)
+  set queryOptions($1.QueryOptions value) => $_setField(11, value);
+  @$pb.TagNumber(11)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(11)
+  void clearQueryOptions() => $_clearField(11);
+  @$pb.TagNumber(11)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class MovementByFilterResult extends $pb.GeneratedMessage {
@@ -264,11 +310,13 @@ class MovementByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$3.Movement>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -281,6 +329,7 @@ class MovementByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Movement>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Movement.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -323,6 +372,9 @@ class MovementByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class MovementQueryOptions extends $pb.GeneratedMessage {
@@ -495,12 +547,15 @@ class MovementByOperationReferenceQuery extends $pb.GeneratedMessage {
   factory MovementByOperationReferenceQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$core.String>? operationReferences,
+  @$core.Deprecated('This field is deprecated.')
     MovementQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (operationReferences != null) result.operationReferences.addAll(operationReferences);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -513,6 +568,7 @@ class MovementByOperationReferenceQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pPS(2, _omitFieldNames ? '' : 'OperationReferences', protoName: 'OperationReferences')
     ..aOM<MovementQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: MovementQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -547,26 +603,44 @@ class MovementByOperationReferenceQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$core.String> get operationReferences => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   MovementQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(MovementQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   MovementQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class MovementByOperationReferenceResult extends $pb.GeneratedMessage {
   factory MovementByOperationReferenceResult({
     $1.ResultHeader? header,
     $core.Iterable<$3.Movement>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -578,6 +652,7 @@ class MovementByOperationReferenceResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MovementByOperationReferenceResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Movement>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Movement.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -611,6 +686,9 @@ class MovementByOperationReferenceResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$3.Movement> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 
diff --git a/lib/movementQuery.pbjson.dart b/lib/movementQuery.pbjson.dart
index c4847ca5..d0cda9f7 100644
--- a/lib/movementQuery.pbjson.dart
+++ b/lib/movementQuery.pbjson.dart
@@ -20,7 +20,16 @@ const MovementByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.MovementQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.MovementQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,9 @@ const MovementByIdQuery$json = {
 final $typed_data.Uint8List movementByIdQueryDescriptor = $convert.base64Decode(
     'ChFNb3ZlbWVudEJ5SWRRdWVyeRI6CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZWN0SG'
     'VhZGVyQgm6gQEFigECEAFSBkhlYWRlchIvCgNJRHMYAiADKAsyEi5hcGkuUXVlcnlFbnRpdHlJ'
-    'REIJuoEBBZIBAggBUgNJRHMSMwoHT3B0aW9ucxgDIAEoCzIZLmFwaS5Nb3ZlbWVudFF1ZXJ5T3'
-    'B0aW9uc1IHT3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
+    'REIJuoEBBZIBAggBUgNJRHMSNwoHT3B0aW9ucxgDIAEoCzIZLmFwaS5Nb3ZlbWVudFF1ZXJ5T3'
+    'B0aW9uc0ICGAFSB09wdGlvbnMSNQoMUXVlcnlPcHRpb25zGAQgASgLMhEuYXBpLlF1ZXJ5T3B0'
+    'aW9uc1IMUXVlcnlPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
 
 @$core.Deprecated('Use movementByIdResultDescriptor instead')
 const MovementByIdResult$json = {
@@ -38,6 +48,7 @@ const MovementByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Movement', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -45,8 +56,9 @@ const MovementByIdResult$json = {
 /// Descriptor for `MovementByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List movementByIdResultDescriptor = $convert.base64Decode(
     'ChJNb3ZlbWVudEJ5SWRSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYWRlcl'
-    'IGSGVhZGVyEicKB09iamVjdHMYAiADKAsyDS5hcGkuTW92ZW1lbnRSB09iamVjdHM6CqK7GAZS'
-    'ZXN1bHQ=');
+    'IGSGVhZGVyEicKB09iamVjdHMYAiADKAsyDS5hcGkuTW92ZW1lbnRSB09iamVjdHMSQAoQVHJ1'
+    'bmNhdGVkT2JqZWN0cxgEIAMoCzIULmFwaS5UcnVuY2F0ZWRPYmplY3RSEFRydW5jYXRlZE9iam'
+    'VjdHM6CqK7GAZSZXN1bHQ=');
 
 @$core.Deprecated('Use movementByFilterQueryDescriptor instead')
 const MovementByFilterQuery$json = {
@@ -56,9 +68,18 @@ const MovementByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 7, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 8, '4': 1, '5': 11, '6': '.api.MovementQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 8,
+      '4': 1,
+      '5': 11,
+      '6': '.api.MovementQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 9, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 10, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 11, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -69,16 +90,18 @@ final $typed_data.Uint8List movementByFilterQueryDescriptor = $convert.base64Dec
     'VjdEhlYWRlckIJuoEBBYoBAhABUgZIZWFkZXISRgoLbGltaXRGaWx0ZXIYBCABKAlCJJJBITIY'
     'TnVtYmVyIG9mIG1heGltdW0gcmVzdWx0SgUiNTAwIlILbGltaXRGaWx0ZXISIgoMcXVlcnlDb2'
     '50ZXh0GAUgASgJUgxxdWVyeUNvbnRleHQSNAoMQmxvY2tGaWx0ZXJzGAcgAygLMhAuYXBpLkJs'
-    'b2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSMwoHT3B0aW9ucxgIIAEoCzIZLmFwaS5Nb3ZlbWVudF'
-    'F1ZXJ5T3B0aW9uc1IHT3B0aW9ucxLDAgoSVXNhZ2VDb250ZXh0RW50aXR5GAkgASgOMg8uYXBp'
-    'LkVudGl0eVR5cGVCgQKSQf0BMlxPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseSB0aGUgcmVzdH'
-    'JpY3Rpb24gcnVsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNvbnRleHRQYXRo'
-    'KUqcASJGb3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlci'
-    'BTaGlwRnJvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0'
-    'byBPcmRlciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tIlISVXNhZ2'
-    'VDb250ZXh0RW50aXR5EoQBChBVc2FnZUNvbnRleHRQYXRoGAogASgJQliSQVUyU09wdGlvbmFs'
-    'IDogUGF0aCBvZiByZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleHRFbnRpdH'
-    'kgc2hvdWxkIGJlIGRlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIBBkhlYWRlcg==');
+    'b2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSNwoHT3B0aW9ucxgIIAEoCzIZLmFwaS5Nb3ZlbWVudF'
+    'F1ZXJ5T3B0aW9uc0ICGAFSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0eRgJIAEoDjIP'
+    'LmFwaS5FbnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYXBwbHkgdGhlIH'
+    'Jlc3RyaWN0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNhZ2VDb250ZXh0'
+    'UGF0aClKnAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3'
+    'JkZXIgU2hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRp'
+    'dHkgdG8gT3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbSJSEl'
+    'VzYWdlQ29udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgKIAEoCUJYkkFVMlNPcHRp'
+    'b25hbCA6IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VDb250ZXh0RW'
+    '50aXR5IHNob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aBI1CgxRdWVyeU9wdGlv'
+    'bnMYCyABKAsyES5hcGkuUXVlcnlPcHRpb25zUgxRdWVyeU9wdGlvbnM6DpJBCwoJ0gEGSGVhZG'
+    'Vy');
 
 @$core.Deprecated('Use movementByFilterResultDescriptor instead')
 const MovementByFilterResult$json = {
@@ -87,6 +110,7 @@ const MovementByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Movement', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -94,7 +118,8 @@ const MovementByFilterResult$json = {
 final $typed_data.Uint8List movementByFilterResultDescriptor = $convert.base64Decode(
     'ChZNb3ZlbWVudEJ5RmlsdGVyUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLmFwaS5SZXN1bHRIZW'
     'FkZXJSBkhlYWRlchInCgdPYmplY3RzGAIgAygLMg0uYXBpLk1vdmVtZW50UgdPYmplY3RzEiIK'
-    'DHF1ZXJ5Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');
+    'DHF1ZXJ5Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0EkAKEFRydW5jYXRlZE9iamVjdHMYBC'
+    'ADKAsyFC5hcGkuVHJ1bmNhdGVkT2JqZWN0UhBUcnVuY2F0ZWRPYmplY3Rz');
 
 @$core.Deprecated('Use movementQueryOptionsDescriptor instead')
 const MovementQueryOptions$json = {
@@ -159,7 +184,16 @@ const MovementByOperationReferenceQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'OperationReferences', '3': 2, '4': 3, '5': 9, '10': 'OperationReferences'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.MovementQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.MovementQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -168,9 +202,10 @@ const MovementByOperationReferenceQuery$json = {
 final $typed_data.Uint8List movementByOperationReferenceQueryDescriptor = $convert.base64Decode(
     'CiFNb3ZlbWVudEJ5T3BlcmF0aW9uUmVmZXJlbmNlUXVlcnkSOgoGSGVhZGVyGAEgASgLMhcuYX'
     'BpLlF1ZXJ5UHJvamVjdEhlYWRlckIJuoEBBYoBAhABUgZIZWFkZXISMAoTT3BlcmF0aW9uUmVm'
-    'ZXJlbmNlcxgCIAMoCVITT3BlcmF0aW9uUmVmZXJlbmNlcxIzCgdPcHRpb25zGAMgASgLMhkuYX'
-    'BpLk1vdmVtZW50UXVlcnlPcHRpb25zUgdPcHRpb25zOheSQQsKCdIBBkhlYWRlcqK7GAVRdWVy'
-    'eQ==');
+    'ZXJlbmNlcxgCIAMoCVITT3BlcmF0aW9uUmVmZXJlbmNlcxI3CgdPcHRpb25zGAMgASgLMhkuYX'
+    'BpLk1vdmVtZW50UXVlcnlPcHRpb25zQgIYAVIHT3B0aW9ucxI1CgxRdWVyeU9wdGlvbnMYBCAB'
+    'KAsyES5hcGkuUXVlcnlPcHRpb25zUgxRdWVyeU9wdGlvbnM6F5JBCwoJ0gEGSGVhZGVyorsYBV'
+    'F1ZXJ5');
 
 @$core.Deprecated('Use movementByOperationReferenceResultDescriptor instead')
 const MovementByOperationReferenceResult$json = {
@@ -178,6 +213,7 @@ const MovementByOperationReferenceResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Movement', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -186,5 +222,6 @@ const MovementByOperationReferenceResult$json = {
 final $typed_data.Uint8List movementByOperationReferenceResultDescriptor = $convert.base64Decode(
     'CiJNb3ZlbWVudEJ5T3BlcmF0aW9uUmVmZXJlbmNlUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLm'
     'FwaS5SZXN1bHRIZWFkZXJSBkhlYWRlchInCgdPYmplY3RzGAIgAygLMg0uYXBpLk1vdmVtZW50'
-    'UgdPYmplY3RzOgqiuxgGUmVzdWx0');
+    'UgdPYmplY3RzEkAKEFRydW5jYXRlZE9iamVjdHMYAyADKAsyFC5hcGkuVHJ1bmNhdGVkT2JqZW'
+    'N0UhBUcnVuY2F0ZWRPYmplY3RzOgqiuxgGUmVzdWx0');
 
diff --git a/lib/orderQuery.pb.dart b/lib/orderQuery.pb.dart
index 8850123b..384e47ca 100644
--- a/lib/orderQuery.pb.dart
+++ b/lib/orderQuery.pb.dart
@@ -23,12 +23,15 @@ class OrderByIdQuery extends $pb.GeneratedMessage {
   factory OrderByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     OrderQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class OrderByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<OrderQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: OrderQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class OrderByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   OrderQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(OrderQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   OrderQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class OrderByIdResult extends $pb.GeneratedMessage {
   factory OrderByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$2.Order>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class OrderByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OrderByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Order>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Order.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class OrderByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$2.Order> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class OrderByFilterQuery extends $pb.GeneratedMessage {
@@ -147,9 +173,11 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     OrderQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -159,6 +187,7 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -175,6 +204,7 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<OrderQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: OrderQueryOptions.create)
     ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(10, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -229,14 +259,19 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   OrderQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   set options(OrderQueryOptions value) => $_setField(7, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   void clearOptions() => $_clearField(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   OrderQueryOptions ensureOptions() => $_ensure(4);
 
@@ -257,6 +292,17 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(9)
   void clearUsageContextPath() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(10)
+  set queryOptions($1.QueryOptions value) => $_setField(10, value);
+  @$pb.TagNumber(10)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(10)
+  void clearQueryOptions() => $_clearField(10);
+  @$pb.TagNumber(10)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class OrderByFilterResult extends $pb.GeneratedMessage {
@@ -264,11 +310,13 @@ class OrderByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$2.Order>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -281,6 +329,7 @@ class OrderByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Order>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Order.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -323,6 +372,9 @@ class OrderByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class OrderQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/orderQuery.pbjson.dart b/lib/orderQuery.pbjson.dart
index e3c13950..fa228fcc 100644
--- a/lib/orderQuery.pbjson.dart
+++ b/lib/orderQuery.pbjson.dart
@@ -20,7 +20,16 @@ const OrderByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.OrderQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.OrderQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,9 @@ const OrderByIdQuery$json = {
 final $typed_data.Uint8List orderByIdQueryDescriptor = $convert.base64Decode(
     'Cg5PcmRlckJ5SWRRdWVyeRI6CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZWN0SGVhZG'
     'VyQgm6gQEFigECEAFSBkhlYWRlchIvCgNJRHMYAiADKAsyEi5hcGkuUXVlcnlFbnRpdHlJREIJ'
-    'uoEBBZIBAggBUgNJRHMSMAoHT3B0aW9ucxgDIAEoCzIWLmFwaS5PcmRlclF1ZXJ5T3B0aW9uc1'
-    'IHT3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
+    'uoEBBZIBAggBUgNJRHMSNAoHT3B0aW9ucxgDIAEoCzIWLmFwaS5PcmRlclF1ZXJ5T3B0aW9uc0'
+    'ICGAFSB09wdGlvbnMSNQoMUXVlcnlPcHRpb25zGAQgASgLMhEuYXBpLlF1ZXJ5T3B0aW9uc1IM'
+    'UXVlcnlPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
 
 @$core.Deprecated('Use orderByIdResultDescriptor instead')
 const OrderByIdResult$json = {
@@ -38,6 +48,7 @@ const OrderByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Order', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -45,7 +56,9 @@ const OrderByIdResult$json = {
 /// Descriptor for `OrderByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List orderByIdResultDescriptor = $convert.base64Decode(
     'Cg9PcmRlckJ5SWRSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYWRlclIGSG'
-    'VhZGVyEiQKB09iamVjdHMYAiADKAsyCi5hcGkuT3JkZXJSB09iamVjdHM6CqK7GAZSZXN1bHQ=');
+    'VhZGVyEiQKB09iamVjdHMYAiADKAsyCi5hcGkuT3JkZXJSB09iamVjdHMSQAoQVHJ1bmNhdGVk'
+    'T2JqZWN0cxgDIAMoCzIULmFwaS5UcnVuY2F0ZWRPYmplY3RSEFRydW5jYXRlZE9iamVjdHM6Cq'
+    'K7GAZSZXN1bHQ=');
 
 @$core.Deprecated('Use orderByFilterQueryDescriptor instead')
 const OrderByFilterQuery$json = {
@@ -55,9 +68,18 @@ const OrderByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.OrderQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.api.OrderQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 10, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -68,16 +90,17 @@ final $typed_data.Uint8List orderByFilterQueryDescriptor = $convert.base64Decode
     'hlYWRlckIJuoEBBYoBAhABUgZIZWFkZXISRgoLbGltaXRGaWx0ZXIYBCABKAlCJJJBITIYTnVt'
     'YmVyIG9mIG1heGltdW0gcmVzdWx0SgUiNTAwIlILbGltaXRGaWx0ZXISIgoMcXVlcnlDb250ZX'
     'h0GAUgASgJUgxxdWVyeUNvbnRleHQSNAoMQmxvY2tGaWx0ZXJzGAYgAygLMhAuYXBpLkJsb2Nr'
-    'RmlsdGVyUgxCbG9ja0ZpbHRlcnMSMAoHT3B0aW9ucxgHIAEoCzIWLmFwaS5PcmRlclF1ZXJ5T3'
-    'B0aW9uc1IHT3B0aW9ucxLDAgoSVXNhZ2VDb250ZXh0RW50aXR5GAggASgOMg8uYXBpLkVudGl0'
-    'eVR5cGVCgQKSQf0BMlxPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseSB0aGUgcmVzdHJpY3Rpb2'
-    '4gcnVsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNvbnRleHRQYXRoKUqcASJG'
-    'b3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaGlwRn'
-    'JvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBPcmRl'
-    'ciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tIlISVXNhZ2VDb250ZX'
-    'h0RW50aXR5EoQBChBVc2FnZUNvbnRleHRQYXRoGAkgASgJQliSQVUyU09wdGlvbmFsIDogUGF0'
-    'aCBvZiByZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleHRFbnRpdHkgc2hvdW'
-    'xkIGJlIGRlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIBBkhlYWRlcg==');
+    'RmlsdGVyUgxCbG9ja0ZpbHRlcnMSNAoHT3B0aW9ucxgHIAEoCzIWLmFwaS5PcmRlclF1ZXJ5T3'
+    'B0aW9uc0ICGAFSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0eRgIIAEoDjIPLmFwaS5F'
+    'bnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYXBwbHkgdGhlIHJlc3RyaW'
+    'N0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNhZ2VDb250ZXh0UGF0aClK'
+    'nAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3JkZXIgU2'
+    'hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRpdHkgdG8g'
+    'T3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbSJSElVzYWdlQ2'
+    '9udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgJIAEoCUJYkkFVMlNPcHRpb25hbCA6'
+    'IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VDb250ZXh0RW50aXR5IH'
+    'Nob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aBI1CgxRdWVyeU9wdGlvbnMYCiAB'
+    'KAsyES5hcGkuUXVlcnlPcHRpb25zUgxRdWVyeU9wdGlvbnM6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use orderByFilterResultDescriptor instead')
 const OrderByFilterResult$json = {
@@ -86,6 +109,7 @@ const OrderByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Order', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -93,7 +117,8 @@ const OrderByFilterResult$json = {
 final $typed_data.Uint8List orderByFilterResultDescriptor = $convert.base64Decode(
     'ChNPcmRlckJ5RmlsdGVyUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLmFwaS5SZXN1bHRIZWFkZX'
     'JSBkhlYWRlchIkCgdPYmplY3RzGAIgAygLMgouYXBpLk9yZGVyUgdPYmplY3RzEiIKDHF1ZXJ5'
-    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');
+    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0EkAKEFRydW5jYXRlZE9iamVjdHMYBCADKAsyFC'
+    '5hcGkuVHJ1bmNhdGVkT2JqZWN0UhBUcnVuY2F0ZWRPYmplY3Rz');
 
 @$core.Deprecated('Use orderQueryOptionsDescriptor instead')
 const OrderQueryOptions$json = {
diff --git a/lib/partnerQuery.pb.dart b/lib/partnerQuery.pb.dart
index 8cdb77f9..dc7fd05b 100644
--- a/lib/partnerQuery.pb.dart
+++ b/lib/partnerQuery.pb.dart
@@ -23,12 +23,15 @@ class PartnerByIdQuery extends $pb.GeneratedMessage {
   factory PartnerByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     PartnerQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class PartnerByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<PartnerQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: PartnerQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class PartnerByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   PartnerQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(PartnerQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   PartnerQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class PartnerByIdResult extends $pb.GeneratedMessage {
   factory PartnerByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$2.Partner>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class PartnerByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PartnerByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Partner>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Partner.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class PartnerByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$2.Partner> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class PartnerByFilterQuery extends $pb.GeneratedMessage {
@@ -147,9 +173,11 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     PartnerQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -159,6 +187,7 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -175,6 +204,7 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<PartnerQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: PartnerQueryOptions.create)
     ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(10, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -229,14 +259,19 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   PartnerQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   set options(PartnerQueryOptions value) => $_setField(7, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   void clearOptions() => $_clearField(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   PartnerQueryOptions ensureOptions() => $_ensure(4);
 
@@ -257,6 +292,17 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(9)
   void clearUsageContextPath() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(10)
+  set queryOptions($1.QueryOptions value) => $_setField(10, value);
+  @$pb.TagNumber(10)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(10)
+  void clearQueryOptions() => $_clearField(10);
+  @$pb.TagNumber(10)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class PartnerByFilterResult extends $pb.GeneratedMessage {
@@ -264,11 +310,13 @@ class PartnerByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$2.Partner>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -281,6 +329,7 @@ class PartnerByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Partner>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Partner.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -323,6 +372,9 @@ class PartnerByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class PartnerQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/partnerQuery.pbjson.dart b/lib/partnerQuery.pbjson.dart
index 2dc18e8d..ea1c04b4 100644
--- a/lib/partnerQuery.pbjson.dart
+++ b/lib/partnerQuery.pbjson.dart
@@ -20,7 +20,16 @@ const PartnerByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.PartnerQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.PartnerQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,9 @@ const PartnerByIdQuery$json = {
 final $typed_data.Uint8List partnerByIdQueryDescriptor = $convert.base64Decode(
     'ChBQYXJ0bmVyQnlJZFF1ZXJ5EjoKBkhlYWRlchgBIAEoCzIXLmFwaS5RdWVyeVByb2plY3RIZW'
     'FkZXJCCbqBAQWKAQIQAVIGSGVhZGVyEi8KA0lEcxgCIAMoCzISLmFwaS5RdWVyeUVudGl0eUlE'
-    'Qgm6gQEFkgECCAFSA0lEcxIyCgdPcHRpb25zGAMgASgLMhguYXBpLlBhcnRuZXJRdWVyeU9wdG'
-    'lvbnNSB09wdGlvbnM6HZJBEQoP0gEGSGVhZGVy0gEDSURzorsYBVF1ZXJ5');
+    'Qgm6gQEFkgECCAFSA0lEcxI2CgdPcHRpb25zGAMgASgLMhguYXBpLlBhcnRuZXJRdWVyeU9wdG'
+    'lvbnNCAhgBUgdPcHRpb25zEjUKDFF1ZXJ5T3B0aW9ucxgEIAEoCzIRLmFwaS5RdWVyeU9wdGlv'
+    'bnNSDFF1ZXJ5T3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
 
 @$core.Deprecated('Use partnerByIdResultDescriptor instead')
 const PartnerByIdResult$json = {
@@ -38,6 +48,7 @@ const PartnerByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Partner', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -45,8 +56,9 @@ const PartnerByIdResult$json = {
 /// Descriptor for `PartnerByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List partnerByIdResultDescriptor = $convert.base64Decode(
     'ChFQYXJ0bmVyQnlJZFJlc3VsdBIpCgZIZWFkZXIYASABKAsyES5hcGkuUmVzdWx0SGVhZGVyUg'
-    'ZIZWFkZXISJgoHT2JqZWN0cxgCIAMoCzIMLmFwaS5QYXJ0bmVyUgdPYmplY3RzOgqiuxgGUmVz'
-    'dWx0');
+    'ZIZWFkZXISJgoHT2JqZWN0cxgCIAMoCzIMLmFwaS5QYXJ0bmVyUgdPYmplY3RzEkAKEFRydW5j'
+    'YXRlZE9iamVjdHMYAyADKAsyFC5hcGkuVHJ1bmNhdGVkT2JqZWN0UhBUcnVuY2F0ZWRPYmplY3'
+    'RzOgqiuxgGUmVzdWx0');
 
 @$core.Deprecated('Use partnerByFilterQueryDescriptor instead')
 const PartnerByFilterQuery$json = {
@@ -56,9 +68,18 @@ const PartnerByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.PartnerQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.api.PartnerQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 10, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -69,16 +90,18 @@ final $typed_data.Uint8List partnerByFilterQueryDescriptor = $convert.base64Deco
     'N0SGVhZGVyQgm6gQEFigECEAFSBkhlYWRlchJGCgtsaW1pdEZpbHRlchgEIAEoCUIkkkEhMhhO'
     'dW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbn'
     'RleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGkuQmxv'
-    'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVycxIyCgdPcHRpb25zGAcgASgLMhguYXBpLlBhcnRuZXJRdW'
-    'VyeU9wdGlvbnNSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0eRgIIAEoDjIPLmFwaS5F'
-    'bnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYXBwbHkgdGhlIHJlc3RyaW'
-    'N0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNhZ2VDb250ZXh0UGF0aClK'
-    'nAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3JkZXIgU2'
-    'hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRpdHkgdG8g'
-    'T3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbSJSElVzYWdlQ2'
-    '9udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgJIAEoCUJYkkFVMlNPcHRpb25hbCA6'
-    'IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VDb250ZXh0RW50aXR5IH'
-    'Nob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aDoOkkELCgnSAQZIZWFkZXI=');
+    'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVycxI2CgdPcHRpb25zGAcgASgLMhguYXBpLlBhcnRuZXJRdW'
+    'VyeU9wdGlvbnNCAhgBUgdPcHRpb25zEsMCChJVc2FnZUNvbnRleHRFbnRpdHkYCCABKA4yDy5h'
+    'cGkuRW50aXR5VHlwZUKBApJB/QEyXE9wdGlvbmFsIDogRW50aXR5IHRvIGFwcGx5IHRoZSByZX'
+    'N0cmljdGlvbiBydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVzYWdlQ29udGV4dFBh'
+    'dGgpSpwBIkZvciBBY3RvciwgdG8gbGltaXQgdGhlIHJlc3VsdHMgYWNjb3JkaW5nIHRvIE9yZG'
+    'VyIFNoaXBGcm9tIHJlc3RyaWN0aW9uIHJ1bGVzLCBkZWZpbmUgVXNhZ2VDb250ZXh0RW50aXR5'
+    'IHRvIE9yZGVyIGFuZCBVc2FnZUNvbnRleHRQYXRoIHRvIFBheWxvYWQuU2hpcEZyb20iUhJVc2'
+    'FnZUNvbnRleHRFbnRpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCSABKAlCWJJBVTJTT3B0aW9u'
+    'YWwgOiBQYXRoIG9mIHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYWdlQ29udGV4dEVudG'
+    'l0eSBzaG91bGQgYmUgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGgSNQoMUXVlcnlPcHRpb25z'
+    'GAogASgLMhEuYXBpLlF1ZXJ5T3B0aW9uc1IMUXVlcnlPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg'
+    '==');
 
 @$core.Deprecated('Use partnerByFilterResultDescriptor instead')
 const PartnerByFilterResult$json = {
@@ -87,6 +110,7 @@ const PartnerByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Partner', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -94,7 +118,8 @@ const PartnerByFilterResult$json = {
 final $typed_data.Uint8List partnerByFilterResultDescriptor = $convert.base64Decode(
     'ChVQYXJ0bmVyQnlGaWx0ZXJSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYW'
     'RlclIGSGVhZGVyEiYKB09iamVjdHMYAiADKAsyDC5hcGkuUGFydG5lclIHT2JqZWN0cxIiCgxx'
-    'dWVyeUNvbnRleHQYAyABKAlSDHF1ZXJ5Q29udGV4dA==');
+    'dWVyeUNvbnRleHQYAyABKAlSDHF1ZXJ5Q29udGV4dBJAChBUcnVuY2F0ZWRPYmplY3RzGAQgAy'
+    'gLMhQuYXBpLlRydW5jYXRlZE9iamVjdFIQVHJ1bmNhdGVkT2JqZWN0cw==');
 
 @$core.Deprecated('Use partnerQueryOptionsDescriptor instead')
 const PartnerQueryOptions$json = {
diff --git a/lib/shared.pb.dart b/lib/shared.pb.dart
index dffcb642..771d6130 100644
--- a/lib/shared.pb.dart
+++ b/lib/shared.pb.dart
@@ -949,6 +949,233 @@ class QueryProjectHeader extends $pb.GeneratedMessage {
   void clearLocalizedLabel() => $_clearField(5);
 }
 
+/// Options for query messages, including field selection and array truncation
+class QueryOptions extends $pb.GeneratedMessage {
+  factory QueryOptions({
+    $core.Iterable<$core.String>? only,
+    $core.Iterable<QueryTruncateArray>? truncateArrays,
+  }) {
+    final result = create();
+    if (only != null) result.only.addAll(only);
+    if (truncateArrays != null) result.truncateArrays.addAll(truncateArrays);
+    return result;
+  }
+
+  QueryOptions._();
+
+  factory QueryOptions.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory QueryOptions.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'QueryOptions', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..pPS(2, _omitFieldNames ? '' : 'Only', protoName: 'Only')
+    ..pc<QueryTruncateArray>(3, _omitFieldNames ? '' : 'TruncateArrays', $pb.PbFieldType.PM, protoName: 'TruncateArrays', subBuilder: QueryTruncateArray.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  QueryOptions clone() => QueryOptions()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  QueryOptions copyWith(void Function(QueryOptions) updates) => super.copyWith((message) => updates(message as QueryOptions)) as QueryOptions;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static QueryOptions create() => QueryOptions._();
+  @$core.override
+  QueryOptions createEmptyInstance() => create();
+  static $pb.PbList<QueryOptions> createRepeated() => $pb.PbList<QueryOptions>();
+  @$core.pragma('dart2js:noInline')
+  static QueryOptions getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<QueryOptions>(create);
+  static QueryOptions? _defaultInstance;
+
+  @$pb.TagNumber(2)
+  $pb.PbList<$core.String> get only => $_getList(0);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<QueryTruncateArray> get truncateArrays => $_getList(1);
+}
+
+class QueryTruncateArray extends $pb.GeneratedMessage {
+  factory QueryTruncateArray({
+    $core.String? path,
+    $core.int? length,
+  }) {
+    final result = create();
+    if (path != null) result.path = path;
+    if (length != null) result.length = length;
+    return result;
+  }
+
+  QueryTruncateArray._();
+
+  factory QueryTruncateArray.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory QueryTruncateArray.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'QueryTruncateArray', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'Path', protoName: 'Path')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'Length', $pb.PbFieldType.O3, protoName: 'Length')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  QueryTruncateArray clone() => QueryTruncateArray()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  QueryTruncateArray copyWith(void Function(QueryTruncateArray) updates) => super.copyWith((message) => updates(message as QueryTruncateArray)) as QueryTruncateArray;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static QueryTruncateArray create() => QueryTruncateArray._();
+  @$core.override
+  QueryTruncateArray createEmptyInstance() => create();
+  static $pb.PbList<QueryTruncateArray> createRepeated() => $pb.PbList<QueryTruncateArray>();
+  @$core.pragma('dart2js:noInline')
+  static QueryTruncateArray getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<QueryTruncateArray>(create);
+  static QueryTruncateArray? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get path => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set path($core.String value) => $_setString(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasPath() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPath() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get length => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set length($core.int value) => $_setSignedInt32(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasLength() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearLength() => $_clearField(2);
+}
+
+class TruncateArrayResult extends $pb.GeneratedMessage {
+  factory TruncateArrayResult({
+    $core.String? path,
+    $core.int? truncatedArrayLength,
+    $core.int? totalArrayLength,
+  }) {
+    final result = create();
+    if (path != null) result.path = path;
+    if (truncatedArrayLength != null) result.truncatedArrayLength = truncatedArrayLength;
+    if (totalArrayLength != null) result.totalArrayLength = totalArrayLength;
+    return result;
+  }
+
+  TruncateArrayResult._();
+
+  factory TruncateArrayResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory TruncateArrayResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TruncateArrayResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'Path', protoName: 'Path')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'TruncatedArrayLength', $pb.PbFieldType.O3, protoName: 'TruncatedArrayLength')
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'TotalArrayLength', $pb.PbFieldType.O3, protoName: 'TotalArrayLength')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  TruncateArrayResult clone() => TruncateArrayResult()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  TruncateArrayResult copyWith(void Function(TruncateArrayResult) updates) => super.copyWith((message) => updates(message as TruncateArrayResult)) as TruncateArrayResult;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static TruncateArrayResult create() => TruncateArrayResult._();
+  @$core.override
+  TruncateArrayResult createEmptyInstance() => create();
+  static $pb.PbList<TruncateArrayResult> createRepeated() => $pb.PbList<TruncateArrayResult>();
+  @$core.pragma('dart2js:noInline')
+  static TruncateArrayResult getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<TruncateArrayResult>(create);
+  static TruncateArrayResult? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get path => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set path($core.String value) => $_setString(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasPath() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPath() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get truncatedArrayLength => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set truncatedArrayLength($core.int value) => $_setSignedInt32(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasTruncatedArrayLength() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearTruncatedArrayLength() => $_clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get totalArrayLength => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set totalArrayLength($core.int value) => $_setSignedInt32(2, value);
+  @$pb.TagNumber(3)
+  $core.bool hasTotalArrayLength() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearTotalArrayLength() => $_clearField(3);
+}
+
+class TruncatedObject extends $pb.GeneratedMessage {
+  factory TruncatedObject({
+    $core.String? refID,
+    $core.Iterable<TruncateArrayResult>? truncateArrayResults,
+  }) {
+    final result = create();
+    if (refID != null) result.refID = refID;
+    if (truncateArrayResults != null) result.truncateArrayResults.addAll(truncateArrayResults);
+    return result;
+  }
+
+  TruncatedObject._();
+
+  factory TruncatedObject.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory TruncatedObject.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TruncatedObject', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'RefID', protoName: 'RefID')
+    ..pc<TruncateArrayResult>(3, _omitFieldNames ? '' : 'TruncateArrayResults', $pb.PbFieldType.PM, protoName: 'TruncateArrayResults', subBuilder: TruncateArrayResult.create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  TruncatedObject clone() => TruncatedObject()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  TruncatedObject copyWith(void Function(TruncatedObject) updates) => super.copyWith((message) => updates(message as TruncatedObject)) as TruncatedObject;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static TruncatedObject create() => TruncatedObject._();
+  @$core.override
+  TruncatedObject createEmptyInstance() => create();
+  static $pb.PbList<TruncatedObject> createRepeated() => $pb.PbList<TruncatedObject>();
+  @$core.pragma('dart2js:noInline')
+  static TruncatedObject getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<TruncatedObject>(create);
+  static TruncatedObject? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get refID => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set refID($core.String value) => $_setString(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasRefID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearRefID() => $_clearField(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<TruncateArrayResult> get truncateArrayResults => $_getList(1);
+}
+
 class ResultHeader extends $pb.GeneratedMessage {
   factory ResultHeader({
     $core.String? pagingState,
diff --git a/lib/shared.pbjson.dart b/lib/shared.pbjson.dart
index f45382a3..5bd11f6a 100644
--- a/lib/shared.pbjson.dart
+++ b/lib/shared.pbjson.dart
@@ -789,6 +789,70 @@ final $typed_data.Uint8List queryProjectHeaderDescriptor = $convert.base64Decode
     'aW4gdGhlIHVzZXIncyBsYW5ndWFnZVIOTG9jYWxpemVkTGFiZWw6EZJBDgoM0gEJUHJvamVjdE'
     'lE');
 
+@$core.Deprecated('Use queryOptionsDescriptor instead')
+const QueryOptions$json = {
+  '1': 'QueryOptions',
+  '2': [
+    {'1': 'Only', '3': 2, '4': 3, '5': 9, '8': {}, '10': 'Only'},
+    {'1': 'TruncateArrays', '3': 3, '4': 3, '5': 11, '6': '.api.QueryTruncateArray', '8': {}, '10': 'TruncateArrays'},
+  ],
+};
+
+/// Descriptor for `QueryOptions`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List queryOptionsDescriptor = $convert.base64Decode(
+    'CgxRdWVyeU9wdGlvbnMSmgEKBE9ubHkYAiADKAlChQGSQYEBMk1PcHRpb25hbCA6IExpc3Qgb2'
+    'YgZmllbGRzIHRvIGluY2x1ZGUgaW4gdGhlIHJlc3BvbnNlIGZvciBlYWNoIHJldHVybmVkIG9i'
+    'amVjdEowWyJJRC5SZWZJRCIsICJQYXlsb2FkLk5hbWUiLCAiUGF5bG9hZC5MaW5lcy5JRCJdUg'
+    'RPbmx5EtQBCg5UcnVuY2F0ZUFycmF5cxgDIAMoCzIXLmFwaS5RdWVyeVRydW5jYXRlQXJyYXlC'
+    'kgGSQY4BMl9PcHRpb25hbCA6IExpc3Qgb2YgYXJyYXkgZmllbGRzIHRvIHRydW5jYXRlIHRoZS'
+    'BsZW5ndGggaW4gdGhlIHJlc3BvbnNlIGZvciBlYWNoIHJldHVybmVkIG9iamVjdEorWyB7IlBh'
+    'dGgiIDogIlBheWxvYWQuTGluZXMiLCAiTGVuZ3RoIjogMTB9XVIOVHJ1bmNhdGVBcnJheXM=');
+
+@$core.Deprecated('Use queryTruncateArrayDescriptor instead')
+const QueryTruncateArray$json = {
+  '1': 'QueryTruncateArray',
+  '2': [
+    {'1': 'Path', '3': 1, '4': 1, '5': 9, '10': 'Path'},
+    {'1': 'Length', '3': 2, '4': 1, '5': 5, '10': 'Length'},
+  ],
+};
+
+/// Descriptor for `QueryTruncateArray`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List queryTruncateArrayDescriptor = $convert.base64Decode(
+    'ChJRdWVyeVRydW5jYXRlQXJyYXkSEgoEUGF0aBgBIAEoCVIEUGF0aBIWCgZMZW5ndGgYAiABKA'
+    'VSBkxlbmd0aA==');
+
+@$core.Deprecated('Use truncateArrayResultDescriptor instead')
+const TruncateArrayResult$json = {
+  '1': 'TruncateArrayResult',
+  '2': [
+    {'1': 'Path', '3': 1, '4': 1, '5': 9, '10': 'Path'},
+    {'1': 'TruncatedArrayLength', '3': 2, '4': 1, '5': 5, '10': 'TruncatedArrayLength'},
+    {'1': 'TotalArrayLength', '3': 3, '4': 1, '5': 5, '10': 'TotalArrayLength'},
+  ],
+};
+
+/// Descriptor for `TruncateArrayResult`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List truncateArrayResultDescriptor = $convert.base64Decode(
+    'ChNUcnVuY2F0ZUFycmF5UmVzdWx0EhIKBFBhdGgYASABKAlSBFBhdGgSMgoUVHJ1bmNhdGVkQX'
+    'JyYXlMZW5ndGgYAiABKAVSFFRydW5jYXRlZEFycmF5TGVuZ3RoEioKEFRvdGFsQXJyYXlMZW5n'
+    'dGgYAyABKAVSEFRvdGFsQXJyYXlMZW5ndGg=');
+
+@$core.Deprecated('Use truncatedObjectDescriptor instead')
+const TruncatedObject$json = {
+  '1': 'TruncatedObject',
+  '2': [
+    {'1': 'RefID', '3': 1, '4': 1, '5': 9, '10': 'RefID'},
+    {'1': 'TruncateArrayResults', '3': 3, '4': 3, '5': 11, '6': '.api.TruncateArrayResult', '10': 'TruncateArrayResults'},
+  ],
+};
+
+/// Descriptor for `TruncatedObject`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List truncatedObjectDescriptor = $convert.base64Decode(
+    'Cg9UcnVuY2F0ZWRPYmplY3QSFAoFUmVmSUQYASABKAlSBVJlZklEEkwKFFRydW5jYXRlQXJyYX'
+    'lSZXN1bHRzGAMgAygLMhguYXBpLlRydW5jYXRlQXJyYXlSZXN1bHRSFFRydW5jYXRlQXJyYXlS'
+    'ZXN1bHRz');
+
 @$core.Deprecated('Use resultHeaderDescriptor instead')
 const ResultHeader$json = {
   '1': 'ResultHeader',
diff --git a/lib/stockQuery.pb.dart b/lib/stockQuery.pb.dart
index 275c4f48..543a990d 100644
--- a/lib/stockQuery.pb.dart
+++ b/lib/stockQuery.pb.dart
@@ -23,12 +23,15 @@ class StockByIdQuery extends $pb.GeneratedMessage {
   factory StockByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     StockQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class StockByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<StockQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: StockQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class StockByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   StockQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(StockQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   StockQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class StockByIdResult extends $pb.GeneratedMessage {
   factory StockByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$3.Stock>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class StockByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'StockByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Stock>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Stock.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class StockByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$3.Stock> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class StockByFilterQuery extends $pb.GeneratedMessage {
@@ -147,9 +173,11 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
     $core.String? limitFilter,
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
+  @$core.Deprecated('This field is deprecated.')
     StockQueryOptions? options,
     $1.EntityType? usageContextEntity,
     $core.String? usageContextPath,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -159,6 +187,7 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
     if (options != null) result.options = options;
     if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
     if (usageContextPath != null) result.usageContextPath = usageContextPath;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -175,6 +204,7 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
     ..aOM<StockQueryOptions>(8, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: StockQueryOptions.create)
     ..e<$1.EntityType>(9, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
     ..aOS(10, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
+    ..aOM<$1.QueryOptions>(11, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -229,14 +259,19 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   StockQueryOptions get options => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   set options(StockQueryOptions value) => $_setField(8, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   $core.bool hasOptions() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   void clearOptions() => $_clearField(8);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   StockQueryOptions ensureOptions() => $_ensure(4);
 
@@ -257,6 +292,17 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
   $core.bool hasUsageContextPath() => $_has(6);
   @$pb.TagNumber(10)
   void clearUsageContextPath() => $_clearField(10);
+
+  @$pb.TagNumber(11)
+  $1.QueryOptions get queryOptions => $_getN(7);
+  @$pb.TagNumber(11)
+  set queryOptions($1.QueryOptions value) => $_setField(11, value);
+  @$pb.TagNumber(11)
+  $core.bool hasQueryOptions() => $_has(7);
+  @$pb.TagNumber(11)
+  void clearQueryOptions() => $_clearField(11);
+  @$pb.TagNumber(11)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(7);
 }
 
 class StockByFilterResult extends $pb.GeneratedMessage {
@@ -264,11 +310,13 @@ class StockByFilterResult extends $pb.GeneratedMessage {
     $1.ResultHeader? header,
     $core.Iterable<$3.Stock>? objects,
     $core.String? queryContext,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
     if (queryContext != null) result.queryContext = queryContext;
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -281,6 +329,7 @@ class StockByFilterResult extends $pb.GeneratedMessage {
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$3.Stock>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Stock.create)
     ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
+    ..pc<$1.TruncatedObject>(4, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -323,6 +372,9 @@ class StockByFilterResult extends $pb.GeneratedMessage {
   $core.bool hasQueryContext() => $_has(2);
   @$pb.TagNumber(3)
   void clearQueryContext() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(3);
 }
 
 class StockQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/stockQuery.pbjson.dart b/lib/stockQuery.pbjson.dart
index 1b2dc2aa..b60b6f08 100644
--- a/lib/stockQuery.pbjson.dart
+++ b/lib/stockQuery.pbjson.dart
@@ -20,7 +20,16 @@ const StockByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.StockQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.StockQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,9 @@ const StockByIdQuery$json = {
 final $typed_data.Uint8List stockByIdQueryDescriptor = $convert.base64Decode(
     'Cg5TdG9ja0J5SWRRdWVyeRI6CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZWN0SGVhZG'
     'VyQgm6gQEFigECEAFSBkhlYWRlchIvCgNJRHMYAiADKAsyEi5hcGkuUXVlcnlFbnRpdHlJREIJ'
-    'uoEBBZIBAggBUgNJRHMSMAoHT3B0aW9ucxgDIAEoCzIWLmFwaS5TdG9ja1F1ZXJ5T3B0aW9uc1'
-    'IHT3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
+    'uoEBBZIBAggBUgNJRHMSNAoHT3B0aW9ucxgDIAEoCzIWLmFwaS5TdG9ja1F1ZXJ5T3B0aW9uc0'
+    'ICGAFSB09wdGlvbnMSNQoMUXVlcnlPcHRpb25zGAQgASgLMhEuYXBpLlF1ZXJ5T3B0aW9uc1IM'
+    'UXVlcnlPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
 
 @$core.Deprecated('Use stockByIdResultDescriptor instead')
 const StockByIdResult$json = {
@@ -38,6 +48,7 @@ const StockByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Stock', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -45,7 +56,9 @@ const StockByIdResult$json = {
 /// Descriptor for `StockByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List stockByIdResultDescriptor = $convert.base64Decode(
     'Cg9TdG9ja0J5SWRSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYWRlclIGSG'
-    'VhZGVyEiQKB09iamVjdHMYAiADKAsyCi5hcGkuU3RvY2tSB09iamVjdHM6CqK7GAZSZXN1bHQ=');
+    'VhZGVyEiQKB09iamVjdHMYAiADKAsyCi5hcGkuU3RvY2tSB09iamVjdHMSQAoQVHJ1bmNhdGVk'
+    'T2JqZWN0cxgDIAMoCzIULmFwaS5UcnVuY2F0ZWRPYmplY3RSEFRydW5jYXRlZE9iamVjdHM6Cq'
+    'K7GAZSZXN1bHQ=');
 
 @$core.Deprecated('Use stockByFilterQueryDescriptor instead')
 const StockByFilterQuery$json = {
@@ -55,9 +68,18 @@ const StockByFilterQuery$json = {
     {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 7, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'Options', '3': 8, '4': 1, '5': 11, '6': '.api.StockQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 8,
+      '4': 1,
+      '5': 11,
+      '6': '.api.StockQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
     {'1': 'UsageContextEntity', '3': 9, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
     {'1': 'UsageContextPath', '3': 10, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
+    {'1': 'QueryOptions', '3': 11, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -68,16 +90,17 @@ final $typed_data.Uint8List stockByFilterQueryDescriptor = $convert.base64Decode
     'hlYWRlckIJuoEBBYoBAhABUgZIZWFkZXISRgoLbGltaXRGaWx0ZXIYBCABKAlCJJJBITIYTnVt'
     'YmVyIG9mIG1heGltdW0gcmVzdWx0SgUiNTAwIlILbGltaXRGaWx0ZXISIgoMcXVlcnlDb250ZX'
     'h0GAUgASgJUgxxdWVyeUNvbnRleHQSNAoMQmxvY2tGaWx0ZXJzGAcgAygLMhAuYXBpLkJsb2Nr'
-    'RmlsdGVyUgxCbG9ja0ZpbHRlcnMSMAoHT3B0aW9ucxgIIAEoCzIWLmFwaS5TdG9ja1F1ZXJ5T3'
-    'B0aW9uc1IHT3B0aW9ucxLDAgoSVXNhZ2VDb250ZXh0RW50aXR5GAkgASgOMg8uYXBpLkVudGl0'
-    'eVR5cGVCgQKSQf0BMlxPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseSB0aGUgcmVzdHJpY3Rpb2'
-    '4gcnVsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNvbnRleHRQYXRoKUqcASJG'
-    'b3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaGlwRn'
-    'JvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBPcmRl'
-    'ciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tIlISVXNhZ2VDb250ZX'
-    'h0RW50aXR5EoQBChBVc2FnZUNvbnRleHRQYXRoGAogASgJQliSQVUyU09wdGlvbmFsIDogUGF0'
-    'aCBvZiByZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleHRFbnRpdHkgc2hvdW'
-    'xkIGJlIGRlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIBBkhlYWRlcg==');
+    'RmlsdGVyUgxCbG9ja0ZpbHRlcnMSNAoHT3B0aW9ucxgIIAEoCzIWLmFwaS5TdG9ja1F1ZXJ5T3'
+    'B0aW9uc0ICGAFSB09wdGlvbnMSwwIKElVzYWdlQ29udGV4dEVudGl0eRgJIAEoDjIPLmFwaS5F'
+    'bnRpdHlUeXBlQoECkkH9ATJcT3B0aW9uYWwgOiBFbnRpdHkgdG8gYXBwbHkgdGhlIHJlc3RyaW'
+    'N0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVXNhZ2VDb250ZXh0UGF0aClK'
+    'nAEiRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3JkZXIgU2'
+    'hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRpdHkgdG8g'
+    'T3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbSJSElVzYWdlQ2'
+    '9udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgKIAEoCUJYkkFVMlNPcHRpb25hbCA6'
+    'IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VDb250ZXh0RW50aXR5IH'
+    'Nob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aBI1CgxRdWVyeU9wdGlvbnMYCyAB'
+    'KAsyES5hcGkuUXVlcnlPcHRpb25zUgxRdWVyeU9wdGlvbnM6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use stockByFilterResultDescriptor instead')
 const StockByFilterResult$json = {
@@ -86,6 +109,7 @@ const StockByFilterResult$json = {
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Stock', '10': 'Objects'},
     {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
+    {'1': 'TruncatedObjects', '3': 4, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
 };
 
@@ -93,7 +117,8 @@ const StockByFilterResult$json = {
 final $typed_data.Uint8List stockByFilterResultDescriptor = $convert.base64Decode(
     'ChNTdG9ja0J5RmlsdGVyUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLmFwaS5SZXN1bHRIZWFkZX'
     'JSBkhlYWRlchIkCgdPYmplY3RzGAIgAygLMgouYXBpLlN0b2NrUgdPYmplY3RzEiIKDHF1ZXJ5'
-    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');
+    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0EkAKEFRydW5jYXRlZE9iamVjdHMYBCADKAsyFC'
+    '5hcGkuVHJ1bmNhdGVkT2JqZWN0UhBUcnVuY2F0ZWRPYmplY3Rz');
 
 @$core.Deprecated('Use stockQueryOptionsDescriptor instead')
 const StockQueryOptions$json = {
diff --git a/lib/trackingQuery.pb.dart b/lib/trackingQuery.pb.dart
index a99f432a..e80793f5 100644
--- a/lib/trackingQuery.pb.dart
+++ b/lib/trackingQuery.pb.dart
@@ -23,12 +23,15 @@ class TrackingByIdQuery extends $pb.GeneratedMessage {
   factory TrackingByIdQuery({
     $1.QueryProjectHeader? header,
     $core.Iterable<$1.QueryEntityID>? iDs,
+  @$core.Deprecated('This field is deprecated.')
     TrackingQueryOptions? options,
+    $1.QueryOptions? queryOptions,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (iDs != null) result.iDs.addAll(iDs);
     if (options != null) result.options = options;
+    if (queryOptions != null) result.queryOptions = queryOptions;
     return result;
   }
 
@@ -41,6 +44,7 @@ class TrackingByIdQuery extends $pb.GeneratedMessage {
     ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
     ..pc<$1.QueryEntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.QueryEntityID.create)
     ..aOM<TrackingQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: TrackingQueryOptions.create)
+    ..aOM<$1.QueryOptions>(4, _omitFieldNames ? '' : 'QueryOptions', protoName: 'QueryOptions', subBuilder: $1.QueryOptions.create)
     ..hasRequiredFields = false
   ;
 
@@ -75,26 +79,44 @@ class TrackingByIdQuery extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $pb.PbList<$1.QueryEntityID> get iDs => $_getList(1);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   TrackingQueryOptions get options => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set options(TrackingQueryOptions value) => $_setField(3, value);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearOptions() => $_clearField(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   TrackingQueryOptions ensureOptions() => $_ensure(2);
+
+  @$pb.TagNumber(4)
+  $1.QueryOptions get queryOptions => $_getN(3);
+  @$pb.TagNumber(4)
+  set queryOptions($1.QueryOptions value) => $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasQueryOptions() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearQueryOptions() => $_clearField(4);
+  @$pb.TagNumber(4)
+  $1.QueryOptions ensureQueryOptions() => $_ensure(3);
 }
 
 class TrackingByIdResult extends $pb.GeneratedMessage {
   factory TrackingByIdResult({
     $1.ResultHeader? header,
     $core.Iterable<$2.Tracking>? objects,
+    $core.Iterable<$1.TruncatedObject>? truncatedObjects,
   }) {
     final result = create();
     if (header != null) result.header = header;
     if (objects != null) result.objects.addAll(objects);
+    if (truncatedObjects != null) result.truncatedObjects.addAll(truncatedObjects);
     return result;
   }
 
@@ -106,6 +128,7 @@ class TrackingByIdResult extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TrackingByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
     ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
     ..pc<$2.Tracking>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Tracking.create)
+    ..pc<$1.TruncatedObject>(3, _omitFieldNames ? '' : 'TruncatedObjects', $pb.PbFieldType.PM, protoName: 'TruncatedObjects', subBuilder: $1.TruncatedObject.create)
     ..hasRequiredFields = false
   ;
 
@@ -139,6 +162,9 @@ class TrackingByIdResult extends $pb.GeneratedMessage {
 
   @$pb.TagNumber(2)
   $pb.PbList<$2.Tracking> get objects => $_getList(1);
+
+  @$pb.TagNumber(3)
+  $pb.PbList<$1.TruncatedObject> get truncatedObjects => $_getList(2);
 }
 
 class TrackingQueryOptions extends $pb.GeneratedMessage {
diff --git a/lib/trackingQuery.pbjson.dart b/lib/trackingQuery.pbjson.dart
index 354a1dd4..70316820 100644
--- a/lib/trackingQuery.pbjson.dart
+++ b/lib/trackingQuery.pbjson.dart
@@ -20,7 +20,16 @@ const TrackingByIdQuery$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
     {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.QueryEntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.TrackingQueryOptions', '10': 'Options'},
+    {
+      '1': 'Options',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.api.TrackingQueryOptions',
+      '8': {'3': true},
+      '10': 'Options',
+    },
+    {'1': 'QueryOptions', '3': 4, '4': 1, '5': 11, '6': '.api.QueryOptions', '10': 'QueryOptions'},
   ],
   '7': {},
 };
@@ -29,8 +38,9 @@ const TrackingByIdQuery$json = {
 final $typed_data.Uint8List trackingByIdQueryDescriptor = $convert.base64Decode(
     'ChFUcmFja2luZ0J5SWRRdWVyeRI6CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZWN0SG'
     'VhZGVyQgm6gQEFigECEAFSBkhlYWRlchIvCgNJRHMYAiADKAsyEi5hcGkuUXVlcnlFbnRpdHlJ'
-    'REIJuoEBBZIBAggBUgNJRHMSMwoHT3B0aW9ucxgDIAEoCzIZLmFwaS5UcmFja2luZ1F1ZXJ5T3'
-    'B0aW9uc1IHT3B0aW9uczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');
+    'REIJuoEBBZIBAggBUgNJRHMSNwoHT3B0aW9ucxgDIAEoCzIZLmFwaS5UcmFja2luZ1F1ZXJ5T3'
+    'B0aW9uc0ICGAFSB09wdGlvbnMSNQoMUXVlcnlPcHRpb25zGAQgASgLMhEuYXBpLlF1ZXJ5T3B0'
+    'aW9uc1IMUXVlcnlPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
 
 @$core.Deprecated('Use trackingByIdResultDescriptor instead')
 const TrackingByIdResult$json = {
@@ -38,6 +48,7 @@ const TrackingByIdResult$json = {
   '2': [
     {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
     {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Tracking', '10': 'Objects'},
+    {'1': 'TruncatedObjects', '3': 3, '4': 3, '5': 11, '6': '.api.TruncatedObject', '10': 'TruncatedObjects'},
   ],
   '7': {},
 };
@@ -45,8 +56,9 @@ const TrackingByIdResult$json = {
 /// Descriptor for `TrackingByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List trackingByIdResultDescriptor = $convert.base64Decode(
     'ChJUcmFja2luZ0J5SWRSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYWRlcl'
-    'IGSGVhZGVyEicKB09iamVjdHMYAiADKAsyDS5hcGkuVHJhY2tpbmdSB09iamVjdHM6CqK7GAZS'
-    'ZXN1bHQ=');
+    'IGSGVhZGVyEicKB09iamVjdHMYAiADKAsyDS5hcGkuVHJhY2tpbmdSB09iamVjdHMSQAoQVHJ1'
+    'bmNhdGVkT2JqZWN0cxgDIAMoCzIULmFwaS5UcnVuY2F0ZWRPYmplY3RSEFRydW5jYXRlZE9iam'
+    'VjdHM6CqK7GAZSZXN1bHQ=');
 
 @$core.Deprecated('Use trackingQueryOptionsDescriptor instead')
 const TrackingQueryOptions$json = {
diff --git a/pubspec.yaml b/pubspec.yaml
index 432cbfd5..cd248683 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-260909085816
+version: 1.15.0-SNAPSHOT-260909131042
 homepage: ''
 publish_to: ''
 repository: ''