diff --git a/src/index.tsx b/src/index.tsx
index a3b66d9..c5acf7c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -134,11 +134,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -153,7 +151,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -164,11 +161,9 @@ export type FilterInput =
       annotations: Array<ShotAnnotationInput>;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -183,7 +178,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -194,11 +188,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle: RangeFilter;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -213,7 +205,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -224,11 +215,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance: RangeFilter;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -243,7 +232,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -254,41 +242,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject: RangeFilter;
-      cueBallSpeed?: never;
-      cueObjectAngle?: never;
-      cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
-      difficulty?: never;
-      intendedPocketType?: never;
-      isDirect?: never;
-      isLeft?: never;
-      isLeftMiss?: never;
-      isRight?: never;
-      isRightMiss?: never;
-      isStraight?: never;
-      kickAngle?: never;
-      kickDistance?: never;
-      make?: never;
-      notFilter?: never;
-      orFilters?: never;
-      shotDirection?: never;
-      spinType?: never;
-      tags?: never;
-      targetPocketDistance?: never;
-      userId?: never;
-      videoId?: never;
-    }
-  | {
-      andFilters?: never;
-      annotations?: never;
-      bankAngle?: never;
-      bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed: RangeFilter;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -303,7 +259,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -314,11 +269,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle: RangeFilter;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -333,7 +286,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -344,11 +296,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance: RangeFilter;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -363,7 +313,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -374,41 +323,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject: RangeFilter;
-      difficulty?: never;
-      intendedPocketType?: never;
-      isDirect?: never;
-      isLeft?: never;
-      isLeftMiss?: never;
-      isRight?: never;
-      isRightMiss?: never;
-      isStraight?: never;
-      kickAngle?: never;
-      kickDistance?: never;
-      make?: never;
-      notFilter?: never;
-      orFilters?: never;
-      shotDirection?: never;
-      spinType?: never;
-      tags?: never;
-      targetPocketDistance?: never;
-      userId?: never;
-      videoId?: never;
-    }
-  | {
-      andFilters?: never;
-      annotations?: never;
-      bankAngle?: never;
-      bankDistance?: never;
-      cueAngleAfterObject?: never;
-      cueBallSpeed?: never;
-      cueObjectAngle?: never;
-      cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty: RangeFilter;
       intendedPocketType?: never;
       isDirect?: never;
@@ -423,7 +340,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -434,11 +350,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType: Array<PocketEnum>;
       isDirect?: never;
@@ -453,7 +367,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -464,11 +377,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect: Array<Scalars["Boolean"]["input"]>;
@@ -483,7 +394,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -494,11 +404,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -513,7 +421,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -524,11 +431,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -543,7 +448,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -554,11 +458,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -573,7 +475,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -584,11 +485,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -603,7 +502,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -614,11 +512,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -633,7 +529,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -644,11 +539,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -663,7 +556,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -674,11 +566,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -693,7 +583,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -704,11 +593,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -723,7 +610,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -734,11 +620,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -753,7 +637,6 @@ export type FilterInput =
       notFilter: FilterInput;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -764,11 +647,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -783,7 +664,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters: Array<FilterInput>;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -794,11 +674,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -813,7 +691,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection: Array<ShotDirectionEnum>;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -824,11 +701,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -843,37 +718,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType: Array<Scalars["String"]["input"]>;
-      tags?: never;
-      targetPocketDistance?: never;
-      userId?: never;
-      videoId?: never;
-    }
-  | {
-      andFilters?: never;
-      annotations?: never;
-      bankAngle?: never;
-      bankDistance?: never;
-      cueAngleAfterObject?: never;
-      cueBallSpeed?: never;
-      cueObjectAngle?: never;
-      cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
-      difficulty?: never;
-      intendedPocketType?: never;
-      isDirect?: never;
-      isLeft?: never;
-      isLeftMiss?: never;
-      isRight?: never;
-      isRightMiss?: never;
-      isStraight?: never;
-      kickAngle?: never;
-      kickDistance?: never;
-      make?: never;
-      notFilter?: never;
-      orFilters?: never;
-      shotDirection?: never;
-      spinType?: never;
       tags: Array<VideoTagInput>;
       targetPocketDistance?: never;
       userId?: never;
@@ -884,11 +728,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -903,7 +745,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance: RangeFilter;
       userId?: never;
@@ -914,11 +755,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -933,7 +772,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId: Array<Scalars["Int"]["input"]>;
@@ -944,11 +782,9 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
-      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
-      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -963,7 +799,6 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
-      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -1114,6 +949,7 @@ export type Query = {
   getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
   getShots: Array<ShotGql>;
   getUser?: Maybe<UserGql>;
+  getUserTags: UserTagsGql;
   getUserVideos: VideoHistoryGql;
   getUsernames: Array<Scalars["String"]["output"]>;
   getVideo: VideoGql;
@@ -1141,6 +977,10 @@ export type QueryGetUserArgs = {
   userId: Scalars["Int"]["input"];
 };
 
+export type QueryGetUserTagsArgs = {
+  userId: Scalars["Int"]["input"];
+};
+
 export type QueryGetUserVideosArgs = {
   after?: InputMaybe<Scalars["String"]["input"]>;
   filters?: InputMaybe<VideoFilterInput>;
@@ -1229,6 +1069,12 @@ export enum StreamSegmentTypeEnum {
   RbChunkedMp4 = "RB_CHUNKED_MP4",
 }
 
+export type TagGql = {
+  __typename?: "TagGQL";
+  id: Scalars["Int"]["output"];
+  name: Scalars["String"]["output"];
+};
+
 export type TargetMetricsGql = {
   __typename?: "TargetMetricsGQL";
   averageDifficulty?: Maybe<Scalars["Float"]["output"]>;
@@ -1293,6 +1139,11 @@ export type UserPlayTimeGql = {
   totalSeconds: Scalars["Float"]["output"];
 };
 
+export type UserTagsGql = {
+  __typename?: "UserTagsGQL";
+  tags: Array<TagGql>;
+};
+
 export type VideoFilterInput = {
   isStreamCompleted?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireCursorCompletion?: Scalars["Boolean"]["input"];
@@ -1335,7 +1186,7 @@ export type VideoMetadataInput = {
   framesPerSecond?: InputMaybe<Scalars["Float"]["input"]>;
   gameType?: InputMaybe<Scalars["String"]["input"]>;
   lastIntendedSegmentBound?: InputMaybe<Scalars["Int"]["input"]>;
-  resolution?: InputMaybe<VideoResolution>;
+  resolution: VideoResolution;
   startTime?: InputMaybe<Scalars["DateTime"]["input"]>;
   streamSegmentType?: InputMaybe<StreamSegmentTypeEnum>;
   tableSize?: InputMaybe<Scalars["String"]["input"]>;
diff --git a/src/schema.gql b/src/schema.gql
index ef67913..6ac2d95 100644
--- a/src/schema.gql
+++ b/src/schema.gql
@@ -24,6 +24,7 @@ type Query {
     after: String = null
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
+  getUserTags(userId: Int!): UserTagsGQL!
   getVideo(videoId: Int!): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
 }
@@ -94,9 +95,6 @@ input FilterInput @oneOf {
   bankDistance: RangeFilter
   kickAngle: RangeFilter
   kickDistance: RangeFilter
-  cueAngleAfterObject: RangeFilter
-  cueSpeedAfterObject: RangeFilter
-  spinType: [String!]
 }
 
 input RangeFilter {
@@ -358,6 +356,15 @@ input VideoFilterInput {
   requireCursorCompletion: Boolean! = true
 }
 
+type UserTagsGQL {
+  tags: [TagGQL!]!
+}
+
+type TagGQL {
+  name: String!
+  id: Int!
+}
+
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
@@ -398,6 +405,7 @@ type CreateUploadStreamReturn {
 }
 
 input VideoMetadataInput {
+  resolution: VideoResolution!
   videoName: String = null
   startTime: DateTime = null
   endTime: DateTime = null
@@ -407,10 +415,14 @@ input VideoMetadataInput {
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
   endStream: Boolean! = false
-  resolution: VideoResolution = null
   framesPerSecond: Float = null
 }
 
+input VideoResolution {
+  width: Int!
+  height: Int!
+}
+
 input UploadStreamMetadataInput {
   deviceType: DeviceTypeEnum = null
   osVersion: String = null
@@ -433,8 +445,3 @@ enum StreamSegmentTypeEnum {
   FRAGMENTED_MP4
   RB_CHUNKED_MP4
 }
-
-input VideoResolution {
-  width: Int!
-  height: Int!
-}