diff --git a/google/firestore/admin/v1/operation.proto b/google/firestore/admin/v1/operation.proto
index 08194fe0..6494ab7c 100644
--- a/google/firestore/admin/v1/operation.proto
+++ b/google/firestore/admin/v1/operation.proto
@@ -162,17 +162,6 @@ message ExportDocumentsResponse {
   string output_uri_prefix = 1;
 }
 
-// Describes the progress of the operation.
-// Unit of work is generic and must be interpreted based on where [Progress][google.firestore.admin.v1.Progress]
-// is used.
-message Progress {
-  // The amount of work estimated.
-  int64 estimated_work = 1;
-
-  // The amount of work completed.
-  int64 completed_work = 2;
-}
-
 // Describes the state of the operation.
 enum OperationState {
   // Unspecified.
@@ -201,3 +190,14 @@ enum OperationState {
   // google.longrunning.Operations.CancelOperation.
   CANCELLED = 7;
 }
+
+// Describes the progress of the operation.
+// Unit of work is generic and must be interpreted based on where [Progress][google.firestore.admin.v1.Progress]
+// is used.
+message Progress {
+  // The amount of work estimated.
+  int64 estimated_work = 1;
+
+  // The amount of work completed.
+  int64 completed_work = 2;
+}
diff --git a/google/firestore/v1/query.proto b/google/firestore/v1/query.proto
index e2d7b836..a8d5e7a2 100644
--- a/google/firestore/v1/query.proto
+++ b/google/firestore/v1/query.proto
@@ -102,6 +102,14 @@ message StructuredQuery {
 
       // Contains. Requires that the field is an array.
       ARRAY_CONTAINS = 7;
+
+      // In. Requires that `value` is a non-empty ArrayValue with at most 10
+      // values.
+      IN = 8;
+
+      // Contains any. Requires that the field is an array and
+      // `value` is a non-empty ArrayValue with at most 10 values.
+      ARRAY_CONTAINS_ANY = 9;
     }
 
     // The field to filter by.
@@ -114,18 +122,6 @@ message StructuredQuery {
     Value value = 3;
   }
 
-  // A sort direction.
-  enum Direction {
-    // Unspecified.
-    DIRECTION_UNSPECIFIED = 0;
-
-    // Ascending.
-    ASCENDING = 1;
-
-    // Descending.
-    DESCENDING = 2;
-  }
-
   // A filter with a single operand.
   message UnaryFilter {
     // A unary operator.
@@ -150,6 +146,15 @@ message StructuredQuery {
     }
   }
 
+  // The projection of document's fields to return.
+  message Projection {
+    // The fields to return.
+    //
+    // If empty, all fields are returned. To only return the name
+    // of the document, use `['__name__']`.
+    repeated FieldReference fields = 2;
+  }
+
   // An order on a field.
   message Order {
     // The field to order by.
@@ -164,13 +169,16 @@ message StructuredQuery {
     string field_path = 2;
   }
 
-  // The projection of document's fields to return.
-  message Projection {
-    // The fields to return.
-    //
-    // If empty, all fields are returned. To only return the name
-    // of the document, use `['__name__']`.
-    repeated FieldReference fields = 2;
+  // A sort direction.
+  enum Direction {
+    // Unspecified.
+    DIRECTION_UNSPECIFIED = 0;
+
+    // Ascending.
+    ASCENDING = 1;
+
+    // Descending.
+    DESCENDING = 2;
   }
 
   // The projection to return.
diff --git a/google/firestore/v1beta1/query.proto b/google/firestore/v1beta1/query.proto
index fb9e4e55..a8068ae6 100644
--- a/google/firestore/v1beta1/query.proto
+++ b/google/firestore/v1beta1/query.proto
@@ -102,6 +102,14 @@ message StructuredQuery {
 
       // Contains. Requires that the field is an array.
       ARRAY_CONTAINS = 7;
+
+      // In. Requires that `value` is a non-empty ArrayValue with at most 10
+      // values.
+      IN = 8;
+
+      // Contains any. Requires that the field is an array and
+      // `value` is a non-empty ArrayValue with at most 10 values.
+      ARRAY_CONTAINS_ANY = 9;
     }
 
     // The field to filter by.
@@ -147,6 +155,15 @@ message StructuredQuery {
     Direction direction = 2;
   }
 
+  // The projection of document's fields to return.
+  message Projection {
+    // The fields to return.
+    //
+    // If empty, all fields are returned. To only return the name
+    // of the document, use `['__name__']`.
+    repeated FieldReference fields = 2;
+  }
+
   // A reference to a field, such as `max(messages.time) as max_time`.
   message FieldReference {
     string field_path = 2;
@@ -164,15 +181,6 @@ message StructuredQuery {
     DESCENDING = 2;
   }
 
-  // The projection of document's fields to return.
-  message Projection {
-    // The fields to return.
-    //
-    // If empty, all fields are returned. To only return the name
-    // of the document, use `['__name__']`.
-    repeated FieldReference fields = 2;
-  }
-
   // The projection to return.
   Projection select = 1;