diff --git a/RMuseum/DbContext/RMuseumDbContext.cs b/RMuseum/DbContext/RMuseumDbContext.cs
index 7529997a..49596788 100644
--- a/RMuseum/DbContext/RMuseumDbContext.cs
+++ b/RMuseum/DbContext/RMuseumDbContext.cs
@@ -619,5 +619,10 @@ namespace RMuseum.DbContext
         /// </summary>
         public DbSet<GanjoorTajikVerse> TajikVerses { get; set; }
 
+        /// <summary>
+        /// tajik pages
+        /// </summary>
+        public DbSet<GanjoorTajikPage> TajikPages { get; set; }
+
     }
 }
diff --git a/RMuseum/Models/Ganjoor/GanjoorTajikPage.cs b/RMuseum/Models/Ganjoor/GanjoorTajikPage.cs
new file mode 100644
index 00000000..37786069
--- /dev/null
+++ b/RMuseum/Models/Ganjoor/GanjoorTajikPage.cs
@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace RMuseum.Models.Ganjoor
+{
+    public class GanjoorTajikPage
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// verses text as html (ganjoor.net format)
+        /// </summary>
+        public string TajikHtmlText { get; set; }
+
+    }
+}
diff --git a/RMuseum/Models/Ganjoor/GanjoorTajikPoem.cs b/RMuseum/Models/Ganjoor/GanjoorTajikPoem.cs
index 47eb0a29..6520d4e5 100644
--- a/RMuseum/Models/Ganjoor/GanjoorTajikPoem.cs
+++ b/RMuseum/Models/Ganjoor/GanjoorTajikPoem.cs
@@ -25,11 +25,5 @@ namespace RMuseum.Models.Ganjoor
         /// verses text
         /// </summary>
         public string TajikPlainText { get; set; }
-
-        /// <summary>
-        /// verses text as html (ganjoor.net format)
-        /// </summary>
-        public string TajikHtmlText { get; set; }
-
     }
 }
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index c32e9ee1..a3b0f894 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -3638,6 +3638,11 @@
             tajik verse
             </summary>
         </member>
+        <member name="P:RMuseum.DbContext.RMuseumDbContext.TajikPages">
+            <summary>
+            tajik pages
+            </summary>
+        </member>
         <member name="T:RMuseum.Migrations.PictureFileExtUrl">
             <inheritdoc />
         </member>
@@ -9794,6 +9799,16 @@
             additional descripion or note in Tajik
             </summary>
         </member>
+        <member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPage.Id">
+            <summary>
+            id
+            </summary>
+        </member>
+        <member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPage.TajikHtmlText">
+            <summary>
+            verses text as html (ganjoor.net format)
+            </summary>
+        </member>
         <member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPoem.Id">
             <summary>
             id
@@ -9814,11 +9829,6 @@
             verses text
             </summary>
         </member>
-        <member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPoem.TajikHtmlText">
-            <summary>
-            verses text as html (ganjoor.net format)
-            </summary>
-        </member>
         <member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPoet.Id">
             <summary>
             id
diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Tajik.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Tajik.cs
index 609d7dc8..70dedd93 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Tajik.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Tajik.cs
@@ -47,6 +47,12 @@ namespace RMuseum.Services.Implementation
 
                 int poetId = page.Poem != null ? page.Poem.Category.Poet.Id : page.PoetOrCat.Poet.Id;
 
+                var tajikPage = await _context.TajikPages.AsNoTracking().Where(p => p.Id == page.Id).SingleOrDefaultAsync();
+                if (tajikPage == null)
+                    return new RServiceResult<GanjoorPageCompleteViewModel>(null, "Ин сафҳа ҳануз ба тоҷикии баргардонида нашуда.");
+
+                page.HtmlText = tajikPage.TajikHtmlText;
+
                 var tajikPoet = await _context.TajikPoets.AsNoTracking().Where(p => p.Id == poetId).SingleOrDefaultAsync();
                 if (tajikPoet == null)
                     return new RServiceResult<GanjoorPageCompleteViewModel>(null, "Ин суханвар ҳануз ба тоҷикӣ дар дастрас нест.");
@@ -129,7 +135,7 @@ namespace RMuseum.Services.Implementation
                     var tajikPoem = await _context.TajikPoems.AsNoTracking().Where(p => p.Id == page.Poem.Id).SingleAsync();
                     page.Poem.Title = tajikPoem.TajikTitle;
                     page.Poem.PlainText = tajikPoem.TajikPlainText;
-                    page.Poem.HtmlText = tajikPoem.TajikHtmlText;
+
 
                     var tajikVerses = await _context.TajikVerses.AsNoTracking().Where(v => v.PoemId ==  page.Poem.Id).OrderBy(v => v.VOrder).ToListAsync();
                     foreach( var verse in page.Poem.Verses)
diff --git a/TajikGanjoor/Pages/Index.cshtml.cs b/TajikGanjoor/Pages/Index.cshtml.cs
index 07da95ad..f293ea24 100644
--- a/TajikGanjoor/Pages/Index.cshtml.cs
+++ b/TajikGanjoor/Pages/Index.cshtml.cs
@@ -116,6 +116,7 @@ namespace TajikGanjoor.Pages
                 ViewData["Title"] = title;
             }
             ViewData["BreadCrumpUrls"] = BreadCrumpUrls;
+            ViewData["GoogleAnalyticsCode"] = Configuration["GoogleAnalyticsCode"];
             return Page();
         }