diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml
index 5ee44827..ca668273 100644
--- a/hasura/metadata/query_collections.yaml
+++ b/hasura/metadata/query_collections.yaml
@@ -375,76 +375,6 @@
               }
             }
           }
-      - name: Public - Get manga detail
-        query: |
-          query GetMangaReadingDetail ($id: Int = 1, $user_id: String = "") {
-            manga(where: {_and:{id:{_eq:$id},status:{_neq:"Removed"}}}) {
-              id
-              poster
-              banner
-              status
-              release_date
-              manga_creators {
-                creator {
-                  id
-                  name
-                  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}, where: {status:{_neq:"Inactive"}}) {
-                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
-                }
-              }
-              manga_tags(limit: 5) {
-                tag {
-                  id
-                  tag_languages {
-                    language_id
-                    value
-                  }
-                }
-              }
-              manga_subscribers(where: {user_id:{_eq:$user_id}}) {
-                id
-                created_at
-              }
-            }
-          }
       - name: Public - Search manga
         query: |
           query SearchManga ($text: String = "%%") {
@@ -491,7 +421,7 @@
           }
       - name: Public - Get chapter detail
         query: |
-          query GetChapterReadingDetail ($manga_id: Int = 18, $chapter_number: Int = 1, $user_id: String = "") {
+          query GetChapterReadingDetail ($manga_id: Int = 18, $chapter_number: Int = 1, $user_id: bpchar = "") {
             chapters(where: {_and:{chapter_number:{_eq:$chapter_number},manga:{_and:{id:{_eq:$manga_id},_or:[{status:{_ilike:"On-going"}},{status:{_eq:"Finished"}}]}}}}) {
               id
               chapter_number
@@ -572,7 +502,7 @@
           }
       - name: Public - Get subscribe list
         query: |
-          query GetSubscribeList ($user_id: String = "") {
+          query GetSubscribeList ($user_id: bpchar = "") {
             subscribers(order_by: {created_at:desc}, where: {_and:{user_id:{_eq:$user_id},subscribers_manga:{status:{_neq:"Removed"}}}}) {
               subscribers_manga {
                 id
@@ -880,3 +810,73 @@
               affected_rows
             }
           }
+      - name: Public - Get manga detail
+        query: |
+          query GetMangaReadingDetail ($id: Int = 1, $user_id: bpchar = "") {
+            manga(where: {_and:{id:{_eq:$id},status:{_neq:"Removed"}}}) {
+              id
+              poster
+              banner
+              status
+              release_date
+              manga_creators {
+                creator {
+                  id
+                  name
+                  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}, where: {status:{_neq:"Inactive"}}) {
+                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
+                }
+              }
+              manga_tags(limit: 5) {
+                tag {
+                  id
+                  tag_languages {
+                    language_id
+                    value
+                  }
+                }
+              }
+              manga_subscribers(where: {user_id:{_eq:$user_id}}) {
+                id
+                created_at
+              }
+            }
+          }