diff --git a/hasura/metadata/databases/punkga-pg/tables/public_chapter_languages.yaml b/hasura/metadata/databases/punkga-pg/tables/public_chapter_languages.yaml
index dd5b63e5..15c45ae1 100644
--- a/hasura/metadata/databases/punkga-pg/tables/public_chapter_languages.yaml
+++ b/hasura/metadata/databases/punkga-pg/tables/public_chapter_languages.yaml
@@ -16,7 +16,10 @@ select_permissions:
         - detail
         - id
         - language_id
-      filter: {}
+      filter:
+        chapter:
+          status:
+            _eq: Free
       allow_aggregations: true
   - role: user
     permission:
diff --git a/hasura/metadata/databases/punkga-pg/tables/public_chapters.yaml b/hasura/metadata/databases/punkga-pg/tables/public_chapters.yaml
index dac24f09..43b4ba26 100644
--- a/hasura/metadata/databases/punkga-pg/tables/public_chapters.yaml
+++ b/hasura/metadata/databases/punkga-pg/tables/public_chapters.yaml
@@ -54,7 +54,6 @@ select_permissions:
         - updated_at
         - views
       filter: {}
-      limit: 20
       allow_aggregations: true
   - role: user
     permission:
@@ -73,5 +72,4 @@ select_permissions:
         - updated_at
         - views
       filter: {}
-      limit: 19
       allow_aggregations: true
diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml
index 728c70c8..6321e814 100644
--- a/hasura/metadata/query_collections.yaml
+++ b/hasura/metadata/query_collections.yaml
@@ -448,40 +448,6 @@
               }
             }
           }
-      - 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},_or:[{status:{_ilike:"On-going"}},{status:{_eq:"Finished"}}]}},status:{_eq:"Published"}}}) {
-              id
-              chapter_number
-              chapter_name
-              chapter_type
-              thumbnail_url
-              status
-              pushlish_date
-              chapter_languages {
-                language_id
-                detail
-              }
-              comments: social_activities_aggregate {
-                aggregate {
-                  count
-                }
-              }
-              views
-              chapters_likes_aggregate {
-                aggregate {
-                  count
-                }
-              }
-              chapters_likes(where: {user_id:{_eq:$user_id}}) {
-                id
-                created_at
-                user_id
-                chapter_id
-              }
-            }
-          }
       - name: Admin - Update manga
         query: |
           mutation UpdateManga ($manga_id: Int!, $status: String!, $banner: String!, $poster: String!, $manga_languages: [manga_languages_insert_input!] = {language_id:10,is_main_language:false,description:"",title:""}, $manga_creators: [manga_creator_insert_input!] = {creator_id:10}, $manga_tags: [manga_tag_insert_input!] = {tag_id:10}, $release_date: timestamptz = "") {
@@ -841,3 +807,37 @@
               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},_or:[{status:{_ilike:"On-going"}},{status:{_eq:"Finished"}}]}}}}) {
+              id
+              chapter_number
+              chapter_name
+              chapter_type
+              thumbnail_url
+              status
+              pushlish_date
+              chapter_languages(where: {chapter:{status:{_eq:"Published"}}}) {
+                language_id
+                detail
+              }
+              comments: social_activities_aggregate {
+                aggregate {
+                  count
+                }
+              }
+              views
+              chapters_likes_aggregate {
+                aggregate {
+                  count
+                }
+              }
+              chapters_likes(where: {user_id:{_eq:$user_id}}) {
+                id
+                created_at
+                user_id
+                chapter_id
+              }
+            }
+          }