diff --git a/RMuseum/RMuseum.csproj b/RMuseum/RMuseum.csproj
index 75d6bbb5..ded7aecb 100644
--- a/RMuseum/RMuseum.csproj
+++ b/RMuseum/RMuseum.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Betalgo.Ranul.OpenAI" Version="9.0.1" />
-    <PackageReference Include="DNTPersianUtils.Core" Version="6.5.0" />
+    <PackageReference Include="DNTPersianUtils.Core" Version="6.6.0" />
     <PackageReference Include="FluentFTP" Version="52.0.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2">
diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ModerateCatCorrection.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ModerateCatCorrection.cs
index 87741e3c..02cd925a 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ModerateCatCorrection.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ModerateCatCorrection.cs
@@ -5,6 +5,7 @@ using RSecurityBackend.Models.Generic;
 using System;
 using System.Data;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 
@@ -49,19 +50,6 @@ namespace RMuseum.Services.Implementation
                 {
                     dbPage = await _context.GanjoorPages.Where(p => p.GanjoorPageType == GanjoorPageType.PoetPage && p.PoetId == dbCat.PoetId).SingleAsync();
                 }
-                
-                GanjoorPageSnapshot snapshot = new GanjoorPageSnapshot()
-                {
-                    GanjoorPageId = dbPage.Id,
-                    MadeObsoleteByUserId = userId,
-                    RecordDate = DateTime.Now,
-                    Note = $"بررسی پیشنهاد ویرایش بخش با شناسهٔ {dbCorrection.Id}",
-                    Title = dbPage.Title,
-                    UrlSlug = dbPage.UrlSlug,
-                    HtmlText = dbPage.HtmlText,
-                };
-                _context.GanjoorPageSnapshots.Add(snapshot);
-                await _context.SaveChangesAsync();
 
                 bool updateCat = false;
                 if (dbCorrection.DescriptionHtml != null)
@@ -72,8 +60,32 @@ namespace RMuseum.Services.Implementation
 
                     if (dbCorrection.Result == CorrectionReviewResult.Approved)
                     {
+
+                        GanjoorPageSnapshot snapshot = new GanjoorPageSnapshot()
+                        {
+                            GanjoorPageId = dbPage.Id,
+                            MadeObsoleteByUserId = userId,
+                            RecordDate = DateTime.Now,
+                            Note = $"بررسی پیشنهاد ویرایش بخش با شناسهٔ {dbCorrection.Id}",
+                            Title = dbPage.Title,
+                            UrlSlug = dbPage.UrlSlug,
+                            HtmlText = dbPage.HtmlText,
+                        };
+                        _context.GanjoorPageSnapshots.Add(snapshot);
+                        await _context.SaveChangesAsync();
+
                         dbCorrection.AffectedTheCat = true;
                         dbCat.DescriptionHtml = moderation.DescriptionHtml.Replace("ۀ", "هٔ").Replace("ك", "ک");
+                        dbCat.Description = Regex.Replace(dbCat.DescriptionHtml, "<.*?>", String.Empty);
+
+                        if(dbCat.ParentId == null)
+                        {
+                            var dbPoet = await _context.GanjoorPoets.Where(p => p.Id == dbCat.PoetId).SingleAsync();
+                            dbPoet.Description = dbCat.Description;
+                            _context.Update(dbPoet);
+                        }
+
+
                         updateCat = true;
                     }
                 }
@@ -82,6 +94,13 @@ namespace RMuseum.Services.Implementation
                 if (updateCat)
                 {
                     _context.Update(dbCat);
+                    await _context.SaveChangesAsync();
+                    var tocRes = await GenerateTableOfContents(userId, dbCorrection.CatId, dbCat.TableOfContentsStyle);
+                    if (!string.IsNullOrEmpty(tocRes.ExceptionString))
+                    {
+                        return new RServiceResult<GanjoorCatCorrectionViewModel>(null, tocRes.ExceptionString);
+                    }
+                    dbPage.HtmlText = tocRes.Result;
                     _context.Update(dbPage);
                 }
 
@@ -89,6 +108,7 @@ namespace RMuseum.Services.Implementation
                 _context.GanjoorCatCorrections.Update(dbCorrection);
                 await _context.SaveChangesAsync();
 
+
                 await _notificationService.PushNotification(dbCorrection.UserId,
                                    "بررسی ویرایش پیشنهادی شما برای بخش",
                                    $"با سپاس از زحمت و همت شما ویرایش پیشنهادیتان برای <a href=\"https://ganjoor.net{dbCat.FullUrl}\" target=\"_blank\">{dbPage.FullTitle}</a> بررسی شد.{Environment.NewLine}" +