diff --git a/src/index.tsx b/src/index.tsx
index b10591c..159080c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -54,10 +54,6 @@ export type AggregationInput = {
   enum?: InputMaybe<EnumAggregation>;
 };
 
-export type AndFilter = {
-  filters: Array<FilterInput>;
-};
-
 export type BankFeaturesGql = {
   __typename?: "BankFeaturesGQL";
   bankAngle: Scalars["Float"]["output"];
@@ -134,14 +130,14 @@ export type EnumAggregation = {
 };
 
 export type FilterInput = {
-  andFilters?: InputMaybe<AndFilter>;
+  andFilters?: InputMaybe<Array<FilterInput>>;
   cueBallSpeed?: InputMaybe<RangeFilter>;
   cueObjectAngle?: InputMaybe<RangeFilter>;
   cueObjectDistance?: InputMaybe<RangeFilter>;
   difficulty?: InputMaybe<RangeFilter>;
   intendedPocketType?: InputMaybe<Array<PocketEnum>>;
   make?: InputMaybe<Array<Scalars["Boolean"]["input"]>>;
-  orFilters?: InputMaybe<OrFilter>;
+  orFilters?: InputMaybe<Array<FilterInput>>;
   shotDirection?: InputMaybe<Array<ShotDirectionEnum>>;
   tags?: InputMaybe<Array<VideoTagInput>>;
   targetPocketDistance?: InputMaybe<RangeFilter>;
@@ -236,10 +232,6 @@ export type MutationSetLoggerLevelArgs = {
   path: Scalars["String"]["input"];
 };
 
-export type OrFilter = {
-  filters: Array<FilterInput>;
-};
-
 export type PageInfoGql = {
   __typename?: "PageInfoGQL";
   endCursor?: Maybe<Scalars["String"]["output"]>;
@@ -329,11 +321,6 @@ export type RangeFilter = {
   lessThan?: InputMaybe<Scalars["Float"]["input"]>;
 };
 
-export type SerializedShotPathsGql = {
-  __typename?: "SerializedShotPathsGQL";
-  b64EncodedBuffer?: Maybe<Scalars["String"]["output"]>;
-};
-
 export enum ShotDirectionEnum {
   Left = "LEFT",
   Right = "RIGHT",
@@ -348,7 +335,6 @@ export type ShotGql = {
   endFrame: Scalars["Int"]["output"];
   id: Scalars["Int"]["output"];
   pocketingIntentionFeatures?: Maybe<PocketingIntentionFeaturesGql>;
-  serializedShotPaths?: Maybe<SerializedShotPathsGql>;
   startFrame: Scalars["Int"]["output"];
   updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
   user?: Maybe<UserGql>;
diff --git a/src/schema.gql b/src/schema.gql
index b0735b1..106a0d7 100644
--- a/src/schema.gql
+++ b/src/schema.gql
@@ -44,8 +44,8 @@ input AggregateInputGQL {
 }
 
 input AggregationInput {
-  bucketSet: BucketSetInputGQL = null
-  enum: EnumAggregation = null
+  bucketSet: BucketSetInputGQL
+  enum: EnumAggregation
 }
 
 input BucketSetInputGQL {
@@ -63,27 +63,19 @@ input EnumAggregation {
 }
 
 input FilterInput {
-  andFilters: AndFilter = null
-  orFilters: OrFilter = null
-  cueObjectDistance: RangeFilter = null
-  targetPocketDistance: RangeFilter = null
-  cueObjectAngle: RangeFilter = null
-  cueBallSpeed: RangeFilter = null
-  difficulty: RangeFilter = null
-  intendedPocketType: [PocketEnum!] = null
-  shotDirection: [ShotDirectionEnum!] = null
-  videoId: [Int!] = null
-  userId: [Int!] = null
-  make: [Boolean!] = null
-  tags: [VideoTagInput!] = null
-}
-
-input AndFilter {
-  filters: [FilterInput!]!
-}
-
-input OrFilter {
-  filters: [FilterInput!]!
+  andFilters: [FilterInput!]
+  orFilters: [FilterInput!]
+  cueObjectDistance: RangeFilter
+  targetPocketDistance: RangeFilter
+  cueObjectAngle: RangeFilter
+  cueBallSpeed: RangeFilter
+  difficulty: RangeFilter
+  intendedPocketType: [PocketEnum!]
+  shotDirection: [ShotDirectionEnum!]
+  videoId: [Int!]
+  userId: [Int!]
+  make: [Boolean!]
+  tags: [VideoTagInput!]
 }
 
 input RangeFilter {
@@ -144,7 +136,6 @@ type ShotGQL {
   cueObjectFeatures: CueObjectFeaturesGQL
   pocketingIntentionFeatures: PocketingIntentionFeaturesGQL
   bankFeatures: BankFeaturesGQL
-  serializedShotPaths: SerializedShotPathsGQL
   user: UserGQL
 }
 
@@ -178,10 +169,6 @@ enum WallTypeEnum {
   SHORT
 }
 
-type SerializedShotPathsGQL {
-  b64EncodedBuffer: String
-}
-
 type UserGQL {
   id: Int!
   firebaseUid: String!