diff --git a/Readme.md b/Readme.md
index b9f33014f7b5dc4e81ecbcd6a752f71693e963f3..e554226cd5e56c656354dd9e4d9975493e977411 100644
--- a/Readme.md
+++ b/Readme.md
@@ -31,13 +31,7 @@ Click [here](https://stefancruz.github.io/GrayjayDailymotion/index.html) to inst
 
 - [x] - Save state between clients;
 - [x] - Batch http requests when possible;
-- [ ] - Optimize GraphQL queries;
 - [ ] - Clean up request Headers;
-- [ ] - Stop using configuration option allowAllHttpHeaderAccess;
-- [ ] - Unit tests - (WIP);
-- [ ] - Dev submit;
-- [ ] - API fields deprecated with replacement not available yet (video?.viewCount, video?.stats?.views?.total);
-
 
 ## Todo 
 - [ ] - Search creator's content;
@@ -46,6 +40,9 @@ Click [here](https://stefancruz.github.io/GrayjayDailymotion/index.html) to inst
 - [ ] - Live filter in Subscriptions tab
 - [ ] - Thumbnails for vertical videos
 
+## Dailymotion
+- [ ] - API fields deprecated with replacement not available yet (createdAt - createDate requires authentication, video?.viewCount, video?.stats?.views?.total);
+- [ ] - Platform comments
 
 ## Install
 npm install
@@ -62,5 +59,4 @@ npm start - will build and watch for changes
 
 ## Notes
 - Content of the 'build' folder should not be manually changed since it's recreated for each build. 
-- Used [rollup](https://rollupjs.org/) to bundle all the scripts into one.
-- Used npm shrinkwrap to lock the dependency versions of the project. This should avoid new bugs, vulnerabilities and breaking changes (in minor and patches), introduced when the dependencies are automatically updated by npm.
\ No newline at end of file
+- Used [rollup](https://rollupjs.org/) to bundle the scripts.
\ No newline at end of file
diff --git a/build/DailymotionScript.js b/build/DailymotionScript.js
index e93c6c7c06c3c12e858af5987b866cb40661433d..d877485ea80470b5d29a2c584a32356d1ac65ebd 100644
--- a/build/DailymotionScript.js
+++ b/build/DailymotionScript.js
@@ -101,21 +101,19 @@ const SEARCH_CAPABILITIES = {
 
 const AUTOCOMPLETE_QUERY = `
 query AUTOCOMPLETE_QUERY($query: String!) {
-	search {
-		id
-		suggestedVideos: autosuggestions(
-		query: {eq: $query}
-		filter: {story: {eq: VIDEO}}
-		) {
-		edges {
-			node {
-			name
-			}
-		}
-		}
-	}
-}
-`;
+  search {
+    suggestedVideos: autosuggestions(
+      query: { eq: $query }
+      filter: { story: { eq: VIDEO } }
+    ) {
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}`;
 const CHANNEL_QUERY_DESKTOP = `
 query CHANNEL_QUERY_DESKTOP(
 	$channel_name: String!
@@ -153,13 +151,10 @@ query CHANNEL_QUERY_DESKTOP(
 			}
 		}
 		stats {
-			id
 			views {
-				id
 				total
 			}
 			videos {
-				id
 				total
 			}
 		}
@@ -171,14 +166,12 @@ query CHANNEL_QUERY_DESKTOP(
 			pinterestURL
 		}
 	}
-}
-`;
+}`;
 const SEACH_DISCOVERY_QUERY = `	
 fragment SEARCH_DISCOVERY_VIDEO_FRAGMENT on Video {
 	id
 	xid
 	title
-	isPublished
 	thumbnail(height:$thumbnail_resolution) {
 		url
 	}
@@ -203,9 +196,7 @@ fragment SEARCH_DISCOVERY_VIDEO_FRAGMENT on Video {
 
 query SEACH_DISCOVERY_QUERY($avatar_size: AvatarHeight!, $thumbnail_resolution: ThumbnailHeight!) {
 	home: views {
-		id
 		neon {
-			id
 			sections(space: "home") {
 				edges {
 					node {
@@ -309,7 +300,6 @@ query CHANNEL_VIDEOS_QUERY(
           thumbnail(height: $thumbnail_resolution) {
             url
           }
-          bestAvailableQuality
           duration
           createdAt
           creator {
@@ -357,9 +347,7 @@ fragment VIDEO_BASE_FRAGMENT on Video {
 		}
 	}
 	stats {
-		id
 		views {
-			id
 			total
 		}
 	}
@@ -377,35 +365,6 @@ fragment VIDEO_BASE_FRAGMENT on Video {
 	thumbnail(height:$thumbnail_resolution) {
 		url
 	}
-	
-}
-
-fragment VIDEO_FAVORITES_FRAGMENT on Media {
-	... on Video {
-		id
-		viewerEngagement {
-			id
-			favorited
-		}
-	}
-	... on Live {
-		id
-		viewerEngagement {
-			id
-			favorited
-		}
-	}
-}
-
-fragment CHANNEL_BASE_FRAG on Channel {
-	id
-	xid
-	name
-	displayName
-	description
-	avatar(height:$avatar_size) {
-		url
-	}
 }
 
 fragment PLAYLIST_BASE_FRAG on Collection {
@@ -427,9 +386,7 @@ fragment PLAYLIST_BASE_FRAG on Collection {
 	}
 	description
 	stats {
-		id
 		videos {
-			id
 			total
 		}
 	}
@@ -449,7 +406,6 @@ fragment PLAYLIST_BASE_FRAG on Collection {
 query SEARCH_QUERY(
 	$query: String!
 	$shouldIncludeVideos: Boolean!
-	$shouldIncludeChannels: Boolean!
 	$shouldIncludePlaylists: Boolean!
 	$shouldIncludeLives: Boolean!
 	$page: Int
@@ -462,7 +418,6 @@ query SEARCH_QUERY(
 	$thumbnail_resolution: ThumbnailHeight!
 ) {
 	search {
-		id
 		videos(
 			query: $query
 			first: $limit
@@ -481,7 +436,6 @@ query SEARCH_QUERY(
 				node {
 					id
 					...VIDEO_BASE_FRAGMENT
-					...VIDEO_FAVORITES_FRAGMENT
 				}
 			}
 		}
@@ -522,20 +476,6 @@ query SEARCH_QUERY(
 				}
 			}
 		}
-		channels(query: $query, first: $limit, page: $page)
-			@include(if: $shouldIncludeChannels) {
-			pageInfo {
-				hasNextPage
-				nextPage
-			}
-			totalCount
-			edges {
-				node {
-					id
-					...CHANNEL_BASE_FRAG
-				}
-			}
-		}
 		playlists: collections(query: $query, first: $limit, page: $page)
 			@include(if: $shouldIncludePlaylists) {
 			pageInfo {
@@ -556,21 +496,13 @@ const WATCHING_VIDEO = `
 fragment VIDEO_FRAGMENT on Video {
 	id
 	xid
-	isPublished
 	duration
 	title
 	description
 	thumbnail(height:$thumbnail_resolution) {
 		url
 	}
-	bestAvailableQuality
 	createdAt
-	isPrivate
-	isCreatedForKids
-	isExplicit
-	videoWidth: width
-	videoHeight: height
-	status
 	metrics {
 		engagement {
 			likes {
@@ -585,9 +517,7 @@ fragment VIDEO_FRAGMENT on Video {
 		}
 	}
 	stats {
-		id
 		views {
-			id
 			total
 		}
 	}
@@ -614,17 +544,13 @@ fragment VIDEO_FRAGMENT on Video {
 			}
 		}
 		stats {
-			id
 			views {
-				id
 				total
 			}
 			followers {
-				id
 				total
 			}
 			videos {
-				id
 				total
 			}
 		}
@@ -636,23 +562,14 @@ fragment LIVE_FRAGMENT on Live {
 	xid
 	startAt
 	endAt
-	isPublished
 	title
 	description
 	audienceCount
 	isOnAir
 	thumbnail(height:$thumbnail_resolution){
 		url
-		height
-		width
 	}
-	category
 	createdAt
-	isPrivate
-	isExplicit
-	isCreatedForKids
-	bestAvailableQuality
-	canDisplayAds
 	videoWidth: width
 	videoHeight: height
 	metrics {
@@ -668,9 +585,7 @@ fragment LIVE_FRAGMENT on Live {
 		}
 	}
 	stats {
-		id
 		views {
-			id
 			total
 		}
 	}
@@ -684,43 +599,17 @@ fragment LIVE_FRAGMENT on Live {
 			height
 			width
 		}
-		coverURLx375: coverURL(size: "x375")
 		stats {
-			id
 			views {
-				id
 				total
 			}
 			followers {
-				id
 				total
 			}
 			videos {
-				id
 				total
 			}
 		}
-		country {
-			id
-			codeAlpha2
-		}
-	}
-	language {
-		id
-		codeAlpha2
-	}
-	tags {
-		edges {
-			node {
-				id
-				label
-			}
-		}
-	}
-	geoblockedCountries {
-		id
-		allowed
-		denied
 	}
 }
 
@@ -743,7 +632,6 @@ query WATCHING_VIDEO(
 const SEARCH_CHANNEL = `		
 query SEARCH_QUERY($query: String!, $page: Int, $limit: Int, $avatar_size: AvatarHeight!) {
 	search {
-		id
 		channels(query: $query, first: $limit, page: $page) {
 			pageInfo {
 				hasNextPage
@@ -752,7 +640,6 @@ query SEARCH_QUERY($query: String!, $page: Int, $limit: Int, $avatar_size: Avata
 			totalCount
 			edges {
 				node {
-					id
 					id
 					xid
 					name
@@ -760,8 +647,6 @@ query SEARCH_QUERY($query: String!, $page: Int, $limit: Int, $avatar_size: Avata
 					description
 					avatar(height:$avatar_size) {
 						url
-						height
-						width
 					}
 					metrics {
 						engagement {
@@ -782,10 +667,8 @@ query SEARCH_QUERY($query: String!, $page: Int, $limit: Int, $avatar_size: Avata
 const PLAYLIST_DETAILS_QUERY = `
 query PLAYLIST_VIDEO_QUERY($xid: String!, $numberOfVideos: Int = 100, $avatar_size: AvatarHeight!, $thumbnail_resolution: ThumbnailHeight!) {
 	collection(xid: $xid) {
-		id
 		id
 		xid
-		updatedAt
 		name
 		thumbnail(height:$thumbnail_resolution) {
 			url
@@ -932,7 +815,6 @@ query CHANNEL_PLAYLISTS_QUERY(
 				node {
 					id
 					xid
-					updatedAt
 					createdAt
 					name
 					description
@@ -952,9 +834,7 @@ query CHANNEL_PLAYLISTS_QUERY(
 						url
 					}
 					stats {
-						id
 						videos {
-							id
 							total
 						}
 					}
@@ -984,7 +864,6 @@ query CHANNEL_PLAYLISTS_QUERY(
 const USER_LIKED_VIDEOS_QUERY = `
 query USER_LIKED_VIDEOS_QUERY($page: Int!, $thumbnail_resolution: ThumbnailHeight!) {
 	me {
-		id
 		likedMedias(first: 100, page: $page) {
 			edges {
 				node {
@@ -996,16 +875,8 @@ query USER_LIKED_VIDEOS_QUERY($page: Int!, $thumbnail_resolution: ThumbnailHeigh
 						thumbnail(height:$thumbnail_resolution) {
 							url
 						}
-						aspectRatio
-						viewerEngagement {
-							id
-							liked
-						}
 						channel {
-							id
-							logoURLx25: logoURL(size: "x25")
 							displayName
-							accountType	
 						}
 					}
 					... on Live {
@@ -1017,15 +888,8 @@ query USER_LIKED_VIDEOS_QUERY($page: Int!, $thumbnail_resolution: ThumbnailHeigh
 						thumbnail(height:$thumbnail_resolution) {
 							url
 						}
-						viewerEngagement {
-							id
-							liked
-						}
 						channel {
-							id
-							logoURLx25: logoURL(size: "x25")
 							displayName
-							accountType
 						}
 					}
 				}
@@ -1052,16 +916,8 @@ const USER_WATCH_LATER_VIDEOS_QUERY = `
 						thumbnail(height:$thumbnail_resolution) {
 							url
 						}
-						aspectRatio
 						channel {
-							id
-							logoURLx25: logoURL(size: "x25")
 							displayName
-							accountType
-						}
-						viewerEngagement {
-							id
-							favorited
 						}
 					}
 					... on Live {
@@ -1073,14 +929,7 @@ const USER_WATCH_LATER_VIDEOS_QUERY = `
 							url
 						}
 						channel {
-							id
-							logoURLx25: logoURL(size: "x25")
 							displayName
-							accountType
-						}
-						viewerEngagement {
-							id
-							favorited
 						}
 					}
 				}
@@ -1106,12 +955,8 @@ const USER_WATCHED_VIDEOS_QUERY = `
 					thumbnail(height:$thumbnail_resolution) {
 						url
 					}
-					aspectRatio
 					channel {
-						id
-						logoURLx25: logoURL(size: "x25")
 						displayName
-						accountType
 					}
 				}
 			}
@@ -1301,13 +1146,18 @@ const SourceChannelToGrayjayChannel = (pluginId, sourceChannel) => {
         }
         return acc;
     }, {});
+    let description = '';
+    if (sourceChannel?.tagline && sourceChannel?.tagline != sourceChannel?.description) {
+        description = `${sourceChannel?.tagline}\n\n`;
+    }
+    description += `${sourceChannel?.description ?? ''}`;
     return new PlatformChannel({
         id: new PlatformID(PLATFORM, sourceChannel?.id ?? '', pluginId, PLATFORM_CLAIMTYPE),
         name: sourceChannel?.displayName ?? '',
         thumbnail: sourceChannel?.avatar?.url ?? '',
         banner: sourceChannel.banner?.url ?? '',
         subscribers: sourceChannel?.metrics?.engagement?.followers?.edges?.[0]?.node?.total ?? 0,
-        description: sourceChannel?.description ?? '',
+        description,
         url: `${BASE_URL}/${sourceChannel.name}`,
         links,
     });
@@ -1417,8 +1267,9 @@ const SourceVideoToPlatformVideoDetailsDef = (pluginId, sourceVideo, player_meta
             new Thumbnail(sourceVideo?.thumbnail?.url ?? '', 0),
         ]),
         author: SourceAuthorToGrayjayPlatformAuthorLink(pluginId, sourceVideo?.creator),
-        uploadDate: Math.floor(new Date(sourceVideo?.createDate).getTime() / 1000),
-        datetime: Math.floor(new Date(sourceVideo?.createDate).getTime() / 1000),
+        //TODO: sourceVideo?.createdAt is deprecated but sourceVideo?.createDate requires authentication
+        uploadDate: Math.floor(new Date(sourceVideo?.createdAt).getTime() / 1000),
+        datetime: Math.floor(new Date(sourceVideo?.createdAt).getTime() / 1000),
         duration,
         viewCount,
         url: sourceVideo?.xid ? `${BASE_URL_VIDEO}/${sourceVideo.xid}` : '',
@@ -1850,8 +1701,7 @@ source.getUserSubscriptions = () => {
             operationName: 'SUBSCRIPTIONS_QUERY',
             variables: {
                 first: first,
-                page: page,
-                avatar_size: CREATOR_AVATAR_HEIGHT[_settings?.avatarSizeOptionIndex],
+                page: page
             },
             headers,
             query: GET_USER_SUBSCRIPTIONS,
@@ -1958,7 +1808,6 @@ function searchPlaylists(contextQuery) {
         durationMaxVideos: context.filters?.durationMaxVideos,
         durationMinVideos: context.filters?.durationMinVideos,
         createdAfterVideos: context.filters?.createdAfterVideos, //Represents a DateTime value as specified by iso8601
-        shouldIncludeChannels: false,
         shouldIncludePlaylists: true,
         shouldIncludeVideos: false,
         shouldIncludeLives: false,
@@ -2102,7 +1951,6 @@ function getSearchPagerAll(contextQuery) {
         durationMaxVideos: context.filters?.durationMaxVideos,
         durationMinVideos: context.filters?.durationMinVideos,
         createdAfterVideos: context.filters?.createdAfterVideos, //Represents a DateTime value as specified by iso8601
-        shouldIncludeChannels: false,
         shouldIncludePlaylists: false,
         shouldIncludeVideos: true,
         shouldIncludeLives: true,
@@ -2270,7 +2118,9 @@ function getChannelPlaylists(url, page = 1) {
         usePlatformAuth,
     });
     const channel = gqlResponse.data.channel;
-    const content = (channel?.collections?.edges ?? []).map((edge) => {
+    const content = (channel?.collections?.edges ?? [])
+        .filter(e => e?.node?.metrics?.engagement?.videos?.edges?.[0]?.node?.total) //exclude empty playlists. could be empty doe to geographic restrictions
+        .map((edge) => {
         return SourceCollectionToGrayjayPlaylist(config.id, edge?.node);
     });
     if (content?.length === 0) {
@@ -2317,9 +2167,9 @@ function executeGqlQuery(httpClient, requestOptions) {
     }
     const res = httpClient.POST(BASE_URL_API, gql, headersToAdd, usePlatformAuth);
     if (!res.isOk) {
-        console.error('Failed to get token', res);
+        console.error('Failed to execute request', res);
         if (throwOnError) {
-            throw new ScriptException('Failed to get token', res);
+            throw new ScriptException('Failed to execute request', res);
         }
     }
     const body = JSON.parse(res.body);
diff --git a/src/DailymotionScript.ts b/src/DailymotionScript.ts
index a4b36832ac2d9392e9d914d3a1f272f4044ec38a..f1bb378b789be3e79804bebdcac75e0ea48b2416 100644
--- a/src/DailymotionScript.ts
+++ b/src/DailymotionScript.ts
@@ -576,8 +576,7 @@ source.getUserSubscriptions = (): string[] => {
       operationName: 'SUBSCRIPTIONS_QUERY',
       variables: {
         first: first,
-        page: page,
-        avatar_size: CREATOR_AVATAR_HEIGHT[_settings?.avatarSizeOptionIndex],
+        page: page
       },
       headers,
       query: GET_USER_SUBSCRIPTIONS,
@@ -719,7 +718,6 @@ function searchPlaylists(contextQuery) {
     durationMaxVideos: context.filters?.durationMaxVideos,
     durationMinVideos: context.filters?.durationMinVideos,
     createdAfterVideos: context.filters?.createdAfterVideos, //Represents a DateTime value as specified by iso8601
-    shouldIncludeChannels: false,
     shouldIncludePlaylists: true,
     shouldIncludeVideos: false,
     shouldIncludeLives: false,
@@ -914,7 +912,6 @@ function getSearchPagerAll(contextQuery): VideoPager {
     durationMaxVideos: context.filters?.durationMaxVideos,
     durationMinVideos: context.filters?.durationMinVideos,
     createdAfterVideos: context.filters?.createdAfterVideos, //Represents a DateTime value as specified by iso8601
-    shouldIncludeChannels: false,
     shouldIncludePlaylists: false,
     shouldIncludeVideos: true,
     shouldIncludeLives: true,
@@ -949,6 +946,7 @@ function getSearchPagerAll(contextQuery): VideoPager {
     sort: context.sort,
     filters: context.filters,
   };
+
   return new SearchPagerAll(
     results,
     videoConnection?.pageInfo?.hasNextPage,
@@ -1146,7 +1144,9 @@ function getChannelPlaylists(
 
   const channel = gqlResponse.data.channel as Channel;
 
-  const content: PlatformPlaylist[] = (channel?.collections?.edges ?? []).map(
+  const content: PlatformPlaylist[] = (channel?.collections?.edges ?? [])
+  .filter(e => e?.node?.metrics?.engagement?.videos?.edges?.[0]?.node?.total)//exclude empty playlists. could be empty doe to geographic restrictions
+  .map(
     (edge) => {
       return SourceCollectionToGrayjayPlaylist(config.id, edge?.node);
     },
@@ -1215,9 +1215,9 @@ function executeGqlQuery(httpClient, requestOptions) {
   const res = httpClient.POST(BASE_URL_API, gql, headersToAdd, usePlatformAuth);
 
   if (!res.isOk) {
-    console.error('Failed to get token', res);
+    console.error('Failed to execute request', res);
     if (throwOnError) {
-      throw new ScriptException('Failed to get token', res);
+      throw new ScriptException('Failed to execute request', res);
     }
   }
 
diff --git a/src/Mappers.ts b/src/Mappers.ts
index 111828337ebf0673baa31a8f2e5f2fdb7491825c..ccc3fe9d1de21d76ffaa2657c19209af57a68ced 100644
--- a/src/Mappers.ts
+++ b/src/Mappers.ts
@@ -34,6 +34,14 @@ export const SourceChannelToGrayjayChannel = (
     {} as Record<string, string>,
   );
 
+  let description = ''
+
+  if(sourceChannel?.tagline && sourceChannel?.tagline != sourceChannel?.description){
+    description = `${sourceChannel?.tagline}\n\n`;
+  }
+
+  description += `${sourceChannel?.description ?? ''}`
+
   return new PlatformChannel({
     id: new PlatformID(
       PLATFORM,
@@ -46,7 +54,7 @@ export const SourceChannelToGrayjayChannel = (
     banner: sourceChannel.banner?.url ?? '',
     subscribers:
       sourceChannel?.metrics?.engagement?.followers?.edges?.[0]?.node?.total ?? 0,
-    description: sourceChannel?.description ?? '',
+    description,
     url: `${BASE_URL}/${sourceChannel.name}`,
     links,
   });
@@ -235,8 +243,9 @@ export const SourceVideoToPlatformVideoDetailsDef = (
       pluginId,
       sourceVideo?.creator,
     ),
-    uploadDate: Math.floor(new Date(sourceVideo?.createDate).getTime() / 1000),
-    datetime: Math.floor(new Date(sourceVideo?.createDate).getTime() / 1000),
+    //TODO: sourceVideo?.createdAt is deprecated but sourceVideo?.createDate requires authentication
+    uploadDate: Math.floor(new Date(sourceVideo?.createdAt).getTime() / 1000),
+    datetime: Math.floor(new Date(sourceVideo?.createdAt).getTime() / 1000),
     duration,
     viewCount,
     url: sourceVideo?.xid ? `${BASE_URL_VIDEO}/${sourceVideo.xid}` : '',
diff --git a/src/gqlQueries.ts b/src/gqlQueries.ts
index d607d615adc41dad831e9e60ed096962db0526a3..ec582a1749a9467558ac4b3c022a682d44f91d3a 100644
--- a/src/gqlQueries.ts
+++ b/src/gqlQueries.ts
@@ -1,20 +1,19 @@
 export const AUTOCOMPLETE_QUERY = `
 query AUTOCOMPLETE_QUERY($query: String!) {
-	search {
-		id
-		suggestedVideos: autosuggestions(
-		query: {eq: $query}
-		filter: {story: {eq: VIDEO}}
-		) {
-		edges {
-			node {
-			name
-			}
-		}
-		}
-	}
-}
-`;
+  search {
+    suggestedVideos: autosuggestions(
+      query: { eq: $query }
+      filter: { story: { eq: VIDEO } }
+    ) {
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}`;
+
 export const CHANNEL_QUERY_DESKTOP = `
 query CHANNEL_QUERY_DESKTOP(
 	$channel_name: String!
@@ -52,13 +51,10 @@ query CHANNEL_QUERY_DESKTOP(
 			}
 		}
 		stats {
-			id
 			views {
-				id
 				total
 			}
 			videos {
-				id
 				total
 			}
 		}
@@ -70,14 +66,13 @@ query CHANNEL_QUERY_DESKTOP(
 			pinterestURL
 		}
 	}
-}
-`;
+}`;
+
 export const SEACH_DISCOVERY_QUERY = `	
 fragment SEARCH_DISCOVERY_VIDEO_FRAGMENT on Video {
 	id
 	xid
 	title
-	isPublished
 	thumbnail(height:$thumbnail_resolution) {
 		url
 	}
@@ -102,9 +97,7 @@ fragment SEARCH_DISCOVERY_VIDEO_FRAGMENT on Video {
 
 query SEACH_DISCOVERY_QUERY($avatar_size: AvatarHeight!, $thumbnail_resolution: ThumbnailHeight!) {
 	home: views {
-		id
 		neon {
-			id
 			sections(space: "home") {
 				edges {
 					node {
@@ -209,7 +202,6 @@ query CHANNEL_VIDEOS_QUERY(
           thumbnail(height: $thumbnail_resolution) {
             url
           }
-          bestAvailableQuality
           duration
           createdAt
           creator {
@@ -258,9 +250,7 @@ fragment VIDEO_BASE_FRAGMENT on Video {
 		}
 	}
 	stats {
-		id
 		views {
-			id
 			total
 		}
 	}
@@ -278,35 +268,6 @@ fragment VIDEO_BASE_FRAGMENT on Video {
 	thumbnail(height:$thumbnail_resolution) {
 		url
 	}
-	
-}
-
-fragment VIDEO_FAVORITES_FRAGMENT on Media {
-	... on Video {
-		id
-		viewerEngagement {
-			id
-			favorited
-		}
-	}
-	... on Live {
-		id
-		viewerEngagement {
-			id
-			favorited
-		}
-	}
-}
-
-fragment CHANNEL_BASE_FRAG on Channel {
-	id
-	xid
-	name
-	displayName
-	description
-	avatar(height:$avatar_size) {
-		url
-	}
 }
 
 fragment PLAYLIST_BASE_FRAG on Collection {
@@ -328,9 +289,7 @@ fragment PLAYLIST_BASE_FRAG on Collection {
 	}
 	description
 	stats {
-		id
 		videos {
-			id
 			total
 		}
 	}
@@ -350,7 +309,6 @@ fragment PLAYLIST_BASE_FRAG on Collection {
 query SEARCH_QUERY(
 	$query: String!
 	$shouldIncludeVideos: Boolean!
-	$shouldIncludeChannels: Boolean!
 	$shouldIncludePlaylists: Boolean!
 	$shouldIncludeLives: Boolean!
 	$page: Int
@@ -363,7 +321,6 @@ query SEARCH_QUERY(
 	$thumbnail_resolution: ThumbnailHeight!
 ) {
 	search {
-		id
 		videos(
 			query: $query
 			first: $limit
@@ -382,7 +339,6 @@ query SEARCH_QUERY(
 				node {
 					id
 					...VIDEO_BASE_FRAGMENT
-					...VIDEO_FAVORITES_FRAGMENT
 				}
 			}
 		}
@@ -423,20 +379,6 @@ query SEARCH_QUERY(
 				}
 			}
 		}
-		channels(query: $query, first: $limit, page: $page)
-			@include(if: $shouldIncludeChannels) {
-			pageInfo {
-				hasNextPage
-				nextPage
-			}
-			totalCount
-			edges {
-				node {
-					id
-					...CHANNEL_BASE_FRAG
-				}
-			}
-		}
 		playlists: collections(query: $query, first: $limit, page: $page)
 			@include(if: $shouldIncludePlaylists) {
 			pageInfo {
@@ -458,21 +400,13 @@ export const WATCHING_VIDEO = `
 fragment VIDEO_FRAGMENT on Video {
 	id
 	xid
-	isPublished
 	duration
 	title
 	description
 	thumbnail(height:$thumbnail_resolution) {
 		url
 	}
-	bestAvailableQuality
 	createdAt
-	isPrivate
-	isCreatedForKids
-	isExplicit
-	videoWidth: width
-	videoHeight: height
-	status
 	metrics {
 		engagement {
 			likes {
@@ -487,9 +421,7 @@ fragment VIDEO_FRAGMENT on Video {
 		}
 	}
 	stats {
-		id
 		views {
-			id
 			total
 		}
 	}
@@ -516,17 +448,13 @@ fragment VIDEO_FRAGMENT on Video {
 			}
 		}
 		stats {
-			id
 			views {
-				id
 				total
 			}
 			followers {
-				id
 				total
 			}
 			videos {
-				id
 				total
 			}
 		}
@@ -538,23 +466,14 @@ fragment LIVE_FRAGMENT on Live {
 	xid
 	startAt
 	endAt
-	isPublished
 	title
 	description
 	audienceCount
 	isOnAir
 	thumbnail(height:$thumbnail_resolution){
 		url
-		height
-		width
 	}
-	category
 	createdAt
-	isPrivate
-	isExplicit
-	isCreatedForKids
-	bestAvailableQuality
-	canDisplayAds
 	videoWidth: width
 	videoHeight: height
 	metrics {
@@ -570,9 +489,7 @@ fragment LIVE_FRAGMENT on Live {
 		}
 	}
 	stats {
-		id
 		views {
-			id
 			total
 		}
 	}
@@ -586,43 +503,17 @@ fragment LIVE_FRAGMENT on Live {
 			height
 			width
 		}
-		coverURLx375: coverURL(size: "x375")
 		stats {
-			id
 			views {
-				id
 				total
 			}
 			followers {
-				id
 				total
 			}
 			videos {
-				id
 				total
 			}
 		}
-		country {
-			id
-			codeAlpha2
-		}
-	}
-	language {
-		id
-		codeAlpha2
-	}
-	tags {
-		edges {
-			node {
-				id
-				label
-			}
-		}
-	}
-	geoblockedCountries {
-		id
-		allowed
-		denied
 	}
 }
 
@@ -646,7 +537,6 @@ query WATCHING_VIDEO(
 export const SEARCH_CHANNEL = `		
 query SEARCH_QUERY($query: String!, $page: Int, $limit: Int, $avatar_size: AvatarHeight!) {
 	search {
-		id
 		channels(query: $query, first: $limit, page: $page) {
 			pageInfo {
 				hasNextPage
@@ -655,7 +545,6 @@ query SEARCH_QUERY($query: String!, $page: Int, $limit: Int, $avatar_size: Avata
 			totalCount
 			edges {
 				node {
-					id
 					id
 					xid
 					name
@@ -663,8 +552,6 @@ query SEARCH_QUERY($query: String!, $page: Int, $limit: Int, $avatar_size: Avata
 					description
 					avatar(height:$avatar_size) {
 						url
-						height
-						width
 					}
 					metrics {
 						engagement {
@@ -686,10 +573,8 @@ query SEARCH_QUERY($query: String!, $page: Int, $limit: Int, $avatar_size: Avata
 export const PLAYLIST_DETAILS_QUERY = `
 query PLAYLIST_VIDEO_QUERY($xid: String!, $numberOfVideos: Int = 100, $avatar_size: AvatarHeight!, $thumbnail_resolution: ThumbnailHeight!) {
 	collection(xid: $xid) {
-		id
 		id
 		xid
-		updatedAt
 		name
 		thumbnail(height:$thumbnail_resolution) {
 			url
@@ -840,7 +725,6 @@ query CHANNEL_PLAYLISTS_QUERY(
 				node {
 					id
 					xid
-					updatedAt
 					createdAt
 					name
 					description
@@ -860,9 +744,7 @@ query CHANNEL_PLAYLISTS_QUERY(
 						url
 					}
 					stats {
-						id
 						videos {
-							id
 							total
 						}
 					}
@@ -893,7 +775,6 @@ query CHANNEL_PLAYLISTS_QUERY(
 export const USER_LIKED_VIDEOS_QUERY = `
 query USER_LIKED_VIDEOS_QUERY($page: Int!, $thumbnail_resolution: ThumbnailHeight!) {
 	me {
-		id
 		likedMedias(first: 100, page: $page) {
 			edges {
 				node {
@@ -905,16 +786,8 @@ query USER_LIKED_VIDEOS_QUERY($page: Int!, $thumbnail_resolution: ThumbnailHeigh
 						thumbnail(height:$thumbnail_resolution) {
 							url
 						}
-						aspectRatio
-						viewerEngagement {
-							id
-							liked
-						}
 						channel {
-							id
-							logoURLx25: logoURL(size: "x25")
 							displayName
-							accountType	
 						}
 					}
 					... on Live {
@@ -926,15 +799,8 @@ query USER_LIKED_VIDEOS_QUERY($page: Int!, $thumbnail_resolution: ThumbnailHeigh
 						thumbnail(height:$thumbnail_resolution) {
 							url
 						}
-						viewerEngagement {
-							id
-							liked
-						}
 						channel {
-							id
-							logoURLx25: logoURL(size: "x25")
 							displayName
-							accountType
 						}
 					}
 				}
@@ -962,16 +828,8 @@ export const USER_WATCH_LATER_VIDEOS_QUERY = `
 						thumbnail(height:$thumbnail_resolution) {
 							url
 						}
-						aspectRatio
 						channel {
-							id
-							logoURLx25: logoURL(size: "x25")
 							displayName
-							accountType
-						}
-						viewerEngagement {
-							id
-							favorited
 						}
 					}
 					... on Live {
@@ -983,14 +841,7 @@ export const USER_WATCH_LATER_VIDEOS_QUERY = `
 							url
 						}
 						channel {
-							id
-							logoURLx25: logoURL(size: "x25")
 							displayName
-							accountType
-						}
-						viewerEngagement {
-							id
-							favorited
 						}
 					}
 				}
@@ -1017,12 +868,8 @@ export const USER_WATCHED_VIDEOS_QUERY = `
 					thumbnail(height:$thumbnail_resolution) {
 						url
 					}
-					aspectRatio
 					channel {
-						id
-						logoURLx25: logoURL(size: "x25")
 						displayName
-						accountType
 					}
 				}
 			}