diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml
index a8af6ee7..19521895 100644
--- a/hasura/metadata/query_collections.yaml
+++ b/hasura/metadata/query_collections.yaml
@@ -469,17 +469,13 @@
               bio
             }
           }
-      - name: Public - Query latest update manga
+      - name: Public - Get manga detail
         query: |
-          query GetLatestUpdatedManga {
-            manga(order_by: {chapters_aggregate:{min:{updated_at:desc_nulls_last}}}, limit: 6, where: {status:{_neq:"Removed"}}) {
+          query GetMangaReadingDetail ($id: Int = 1, $user_id: String = "") {
+            manga_by_pk(id: $id) {
               id
-              manga_total_views {
-                views
-              }
-              manga_total_likes {
-                likes
-              }
+              poster
+              banner
               manga_creators {
                 creator {
                   id
@@ -487,30 +483,58 @@
                   isActive
                 }
               }
-              status
-              chapters(limit: 1, order_by: {updated_at:desc}) {
+              manga_total_likes {
+                likes
+              }
+              manga_total_views {
+                views
+              }
+              manga_languages {
+                title
+                description
+                is_main_language
+                language_id
+              }
+              chapters_aggregate {
+                aggregate {
+                  count
+                }
+              }
+              chapters(order_by: {chapter_number:desc_nulls_last}, where: {status:{_neq:"Inactive"}}) {
                 id
                 chapter_number
-                updated_at
+                chapter_name
+                chapter_type
+                thumbnail_url
+                pushlish_date
+                status
+                views
+                chapter_total_likes {
+                  likes
+                }
+                chapters_likes(where: {user_id:{_eq:$user_id}}) {
+                  id
+                  created_at
+                }
+              }
+              manga_subscribers_aggregate {
+                aggregate {
+                  count
+                }
               }
               manga_tags {
                 tag {
                   id
                   tag_languages {
                     language_id
-                    tag_id
                     value
                   }
                 }
               }
-              manga_languages {
-                title
-                description
-                is_main_language
-                language_id
+              manga_subscribers(where: {user_id:{_eq:$user_id}}) {
+                id
+                created_at
               }
-              banner
-              poster
             }
           }
       - name: Public - Get manga list by list id
@@ -533,7 +557,7 @@
                   isActive
                 }
               }
-              chapters(order_by: {pushlish_date:desc_nulls_last}, limit: 1) {
+              chapters(order_by: {pushlish_date:desc_nulls_last}, limit: 1, where: {status:{_eq:"Published"}}) {
                 chapter_number
                 id
                 pushlish_date
@@ -557,14 +581,17 @@
               }
             }
           }
-      - name: Public - Get manga detail
+      - name: Public - Query latest update manga
         query: |
-          query GetMangaReadingDetail ($id: Int = 1, $user_id: String = "") {
-            manga(where: {_and:{id:{_eq:$id},status:{_neq:"Removed"}}}) {
+          query GetLatestUpdatedManga {
+            manga(order_by: {chapters_aggregate:{min:{updated_at:desc_nulls_last}}}, limit: 6, where: {status:{_neq:"Removed"}}) {
               id
-              poster
-              banner
-              status
+              manga_total_views {
+                views
+              }
+              manga_total_likes {
+                likes
+              }
               manga_creators {
                 creator {
                   id
@@ -572,64 +599,36 @@
                   isActive
                 }
               }
-              manga_total_likes {
-                likes
-              }
-              manga_total_views {
-                views
-              }
-              manga_languages {
-                title
-                description
-                is_main_language
-                language_id
-              }
-              chapters_aggregate {
-                aggregate {
-                  count
-                }
-              }
-              chapters(order_by: {chapter_number:desc_nulls_last}) {
+              status
+              chapters(limit: 1, order_by: {updated_at:desc}, where: {status:{_eq:"Published"}}) {
                 id
                 chapter_number
-                chapter_name
-                chapter_type
-                thumbnail_url
-                pushlish_date
-                status
-                views
-                chapter_total_likes {
-                  likes
-                }
-                chapters_likes(where: {user_id:{_eq:$user_id}}) {
-                  id
-                  created_at
-                }
-              }
-              manga_subscribers_aggregate {
-                aggregate {
-                  count
-                }
+                updated_at
               }
               manga_tags {
                 tag {
                   id
                   tag_languages {
                     language_id
+                    tag_id
                     value
                   }
                 }
               }
-              manga_subscribers(where: {user_id:{_eq:$user_id}}) {
-                id
-                created_at
+              manga_languages {
+                title
+                description
+                is_main_language
+                language_id
               }
+              banner
+              poster
             }
           }
       - name: Public - Get chapter detail
         query: |
           query GetChapterReadingDetail ($manga_id: Int = 18, $chapter_number: Int = 1, $user_id: String = "") {
-            chapters(where: {_and:{chapter_number:{_eq:$chapter_number},manga:{_and:{id:{_eq:$manga_id},status:{_neq:"Removed"}}}}}) {
+            chapters(where: {_and:{chapter_number:{_eq:$chapter_number},manga:{_and:{id:{_eq:$manga_id},status:{_eq:"Published"}}}}}) {
               id
               chapter_number
               chapter_name
@@ -680,7 +679,7 @@
                     isActive
                   }
                 }
-                chapters(order_by: {pushlish_date:desc_nulls_last}, limit: 1) {
+                chapters(order_by: {pushlish_date:desc_nulls_last}, limit: 1, where: {status:{_eq:"Published"}}) {
                   chapter_number
                   id
                   pushlish_date
@@ -719,7 +718,7 @@
                 }
               }
               status
-              chapters(limit: 1, order_by: {updated_at:desc}) {
+              chapters(limit: 1, order_by: {updated_at:desc}, where: {status:{_eq:"Published"}}) {
                 id
                 chapter_number
                 updated_at
@@ -755,7 +754,7 @@
           query GetTrendingManga {
             manga(order_by: {manga_total_views:{views:desc_nulls_last}}, limit: 10, where: {status:{_neq:"Removed"}}) {
               id
-              chapters(limit: 1, order_by: {updated_at:desc}) {
+              chapters(limit: 1, order_by: {updated_at:desc}, where: {status:{_eq:"Published"}}) {
                 id
                 chapter_number
                 updated_at