diff --git a/plugins/arabic/rewayatfans.ts b/plugins/arabic/rewayatfans.ts
index a5ee909d9..ea3b72db7 100644
--- a/plugins/arabic/rewayatfans.ts
+++ b/plugins/arabic/rewayatfans.ts
@@ -3,18 +3,19 @@ import { fetchApi } from '@libs/fetch';
 import { Plugin } from '@/types/plugin';
 
 type WPPage = {
-  id: number;
   title: { rendered: string };
   slug: string;
-  link: string;
-  content: { rendered: string };
   date: string;
+  featured_media: number;
+  _embedded?: {
+    'wp:featuredmedia'?: Array<{ source_url: string }>;
+  };
 };
 
 class RewayatFans implements Plugin.PluginBase {
   id = 'rewayatfans';
   name = 'روايات فانز';
-  version = '3.0.0';
+  version = '4.2.0';
   icon = 'src/ar/rewayatfans/icon.png';
   site = 'https://rewayatfans.com/';
 
@@ -30,58 +31,31 @@ class RewayatFans implements Plugin.PluginBase {
     return res.text();
   }
 
+  private getCover(page: WPPage): string {
+    return page._embedded?.['wp:featuredmedia']?.[0]?.source_url || '';
+  }
+
   async popularNovels(
     page: number,
     { showLatestNovels }: Plugin.PopularNovelsOptions,
   ): Promise<Plugin.NovelItem[]> {
-    if (showLatestNovels) {
-      const pages = await this.fetchJson<WPPage[]>(
-        `${this.site}wp-json/wp/v2/pages?per_page=20&page=${page}&orderby=date&order=desc&_fields=slug,title`,
-      );
-      return pages.map(p => ({
-        name: this.extractNovelName(p.title.rendered),
-        path: p.slug,
-        cover: '',
-      }));
-    }
-
-    const allNovels = await this.getAllNovels();
-    const pageSize = 20;
-    const start = (page - 1) * pageSize;
-    return allNovels.slice(start, start + pageSize);
-  }
+    const pages = await this.fetchJson<WPPage[]>(
+      `${this.site}wp-json/wp/v2/pages?per_page=20&page=${page}&orderby=date&order=desc&_embed`,
+    );
 
-  private async getAllNovels(): Promise<Plugin.NovelItem[]> {
     const seen = new Set<string>();
     const novels: Plugin.NovelItem[] = [];
 
-    let pg = 1;
-    let hasMore = true;
-
-    while (hasMore) {
-      const pages = await this.fetchJson<WPPage[]>(
-        `${this.site}wp-json/wp/v2/pages?per_page=100&page=${pg}&_fields=slug,title`,
-      );
-
-      if (pages.length === 0) {
-        hasMore = false;
-        break;
-      }
-
-      for (const page of pages) {
-        const novelName = this.extractNovelName(page.title.rendered);
-        if (novelName && !seen.has(novelName)) {
-          seen.add(novelName);
-          novels.push({
-            name: novelName,
-            path: page.slug,
-            cover: '',
-          });
-        }
+    for (const p of pages) {
+      const novelName = this.extractNovelName(p.title.rendered);
+      if (novelName && !seen.has(novelName)) {
+        seen.add(novelName);
+        novels.push({
+          name: novelName,
+          path: p.slug,
+          cover: this.getCover(p),
+        });
       }
-
-      if (pages.length < 100) hasMore = false;
-      pg++;
     }
 
     return novels;
@@ -95,16 +69,19 @@ class RewayatFans implements Plugin.PluginBase {
     };
 
     const slugBase = novelPath.replace(/\/$/, '').split('/').pop() || novelPath;
-    const searchTerm = slugBase
-      .replace(/-\d+$/, '')
-      .replace(/-/g, ' ');
+    const novelPrefix = slugBase.replace(/-\d+$/, '');
+    const searchName = novelPrefix.replace(/-/g, ' ');
+
+    const normalize = (s: string) =>
+      s.toLowerCase().replace(/[^a-z0-9\s]/g, '').replace(/\s+/g, ' ').trim();
+    const normalizedSearch = normalize(searchName);
 
     let pg = 1;
     let hasMore = true;
 
     while (hasMore) {
       const pages = await this.fetchJson<WPPage[]>(
-        `${this.site}wp-json/wp/v2/pages?search=${encodeURIComponent(searchTerm)}&per_page=100&page=${pg}&_fields=slug,title,date`,
+        `${this.site}wp-json/wp/v2/pages?search=${encodeURIComponent(searchName)}&per_page=100&page=${pg}&_fields=slug,title,date`,
       );
 
       if (pages.length === 0) {
@@ -112,20 +89,23 @@ class RewayatFans implements Plugin.PluginBase {
         break;
       }
 
-      for (const page of pages) {
-        const postSlug = page.slug;
-        if (postSlug.startsWith(slugBase.replace(/-\d+$/, ''))) {
+      for (const p of pages) {
+        const normalizedTitle = normalize(p.title.rendered);
+        if (
+          p.slug.startsWith(novelPrefix) ||
+          normalizedTitle.startsWith(normalizedSearch)
+        ) {
           if (!novel.name) {
-            novel.name = this.extractNovelName(page.title.rendered);
+            novel.name = this.extractNovelName(p.title.rendered);
           }
-          const numMatch = postSlug.match(/(\d+)$/);
+          const numMatch = p.title.rendered.match(/(\d+)\s*$/);
           const chapterNum = numMatch ? parseInt(numMatch[1], 10) : 0;
 
           novel.chapters!.push({
-            name: page.title.rendered,
-            path: postSlug,
+            name: p.title.rendered,
+            path: p.slug,
             chapterNumber: chapterNum,
-            releaseTime: page.date,
+            releaseTime: p.date,
           });
         }
       }
@@ -134,11 +114,12 @@ class RewayatFans implements Plugin.PluginBase {
       pg++;
     }
 
-    if (novel.chapters!.length > 0) {
-      novel.chapters!.sort((a, b) => (a.chapterNumber || 0) - (b.chapterNumber || 0));
-      if (!novel.name && novel.chapters!.length > 0) {
-        novel.name = this.extractNovelName(novel.chapters![0].name);
-      }
+    novel.chapters!.sort(
+      (a, b) => (a.chapterNumber || 0) - (b.chapterNumber || 0),
+    );
+
+    if (!novel.name && novel.chapters!.length > 0) {
+      novel.name = this.extractNovelName(novel.chapters![0].name);
     }
 
     return novel;
@@ -150,8 +131,8 @@ class RewayatFans implements Plugin.PluginBase {
     );
 
     const arr = Array.isArray(pages) ? pages : [pages];
-    if (arr.length > 0 && arr[0].content?.rendered) {
-      const $ = parseHTML(arr[0].content.rendered);
+    if (arr.length > 0 && (arr[0] as any).content?.rendered) {
+      const $ = parseHTML((arr[0] as any).content.rendered);
       $('script, style, .sharedaddy, .jp-relatedposts, .wp-block-spacer').remove();
       return $.html();
     }
@@ -168,20 +149,20 @@ class RewayatFans implements Plugin.PluginBase {
     page: number,
   ): Promise<Plugin.NovelItem[]> {
     const pages = await this.fetchJson<WPPage[]>(
-      `${this.site}wp-json/wp/v2/pages?search=${encodeURIComponent(searchTerm)}&per_page=20&page=${page}&_fields=slug,title`,
+      `${this.site}wp-json/wp/v2/pages?search=${encodeURIComponent(searchTerm)}&per_page=20&page=${page}&_embed`,
     );
 
     const seen = new Set<string>();
     const novels: Plugin.NovelItem[] = [];
 
-    for (const page of pages) {
-      const novelName = this.extractNovelName(page.title.rendered);
+    for (const p of pages) {
+      const novelName = this.extractNovelName(p.title.rendered);
       if (novelName && !seen.has(novelName)) {
         seen.add(novelName);
         novels.push({
           name: novelName,
-          path: page.slug,
-          cover: '',
+          path: p.slug,
+          cover: this.getCover(p),
         });
       }
     }