diff --git a/GanjooRazor/Areas/User/Pages/FAQItems.cshtml b/GanjooRazor/Areas/User/Pages/FAQItems.cshtml
index 65d621c7..a97f925b 100644
--- a/GanjooRazor/Areas/User/Pages/FAQItems.cshtml
+++ b/GanjooRazor/Areas/User/Pages/FAQItems.cshtml
@@ -84,7 +84,7 @@ else
                 <select name="cat" id="cat" onchange="onSelectedCatChanged()">
                     @foreach (var category in Model.Categories)
                     {
-                        @if(category.Id == Model.CatId)
+                        @if (category.Id == Model.CatId)
                         {
                             <option value="@category.Id" selected>@category.Title</option>
                         }
@@ -110,9 +110,12 @@ else
         <a role="button" onclick="newItem()" class="pagebutton">پرسش جدید</a>
     </p>
     <div id="catItems">
-        @foreach(var item in Model.CategoryItems)
+        @if (Model.CategoryItems != null)
         {
-            <p><a href="/User/FAQItemEdit?id=@item.Id">@item.Question</a></p>
+            @foreach (var item in Model.CategoryItems)
+            {
+                <p><a href="/User/FAQItemEdit?id=@item.Id">@item.Question</a></p>
+            }
         }
     </div>
 
diff --git a/GanjooRazor/Areas/User/Pages/FAQItems.cshtml.cs b/GanjooRazor/Areas/User/Pages/FAQItems.cshtml.cs
index ce1b46bf..817385e3 100644
--- a/GanjooRazor/Areas/User/Pages/FAQItems.cshtml.cs
+++ b/GanjooRazor/Areas/User/Pages/FAQItems.cshtml.cs
@@ -52,19 +52,13 @@ namespace GanjooRazor.Areas.User.Pages
                     if(Categories.Length > 0)
                     {
                         CatId = string.IsNullOrEmpty(Request.Query["catId"]) ? Categories[0].Id : int.Parse(Request.Query["catId"]);
-                        response = await secureClient.GetAsync($"{APIRoot.Url}/api/faq/cat/items?catId={CatId}");
+                        response = await secureClient.GetAsync($"{APIRoot.Url}/api/faq/cat/items/secure?catId={CatId}");
                         if (!response.IsSuccessStatusCode)
                         {
                             return new BadRequestObjectResult(JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync()));
                         }
 
-                        var items = JsonConvert.DeserializeObject<FAQItem[]>(await response.Content.ReadAsStringAsync());
-                        if (items == null)
-                        {
-                            items = new FAQItem[] { };
-                        }
-
-                        CategoryItems = items;
+                        CategoryItems = JsonConvert.DeserializeObject<FAQItem[]>(await response.Content.ReadAsStringAsync());
                     }
 
                 }
@@ -104,18 +98,13 @@ namespace GanjooRazor.Areas.User.Pages
             {
                 if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response))
                 {
-                    HttpResponseMessage response = await secureClient.GetAsync($"{APIRoot.Url}/api/faq/cat/items?catId={id}");
+                    HttpResponseMessage response = await secureClient.GetAsync($"{APIRoot.Url}/api/faq/cat/items/secure?catId={id}");
                     if (!response.IsSuccessStatusCode)
                     {
                         return new BadRequestObjectResult(JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync()));
                     }
 
-                    var items = JsonConvert.DeserializeObject<FAQItem[]>(await response.Content.ReadAsStringAsync());
-                    if(items == null)
-                    {
-                        items = new FAQItem[] { };
-                    }
-                    return new JsonResult(items);
+                    return new JsonResult(JsonConvert.DeserializeObject<FAQItem[]>(await response.Content.ReadAsStringAsync()));
 
                 }
                 else
diff --git a/GanjooRazor/appsettings.json b/GanjooRazor/appsettings.json
index f3dde9a2..c0ab857d 100644
--- a/GanjooRazor/appsettings.json
+++ b/GanjooRazor/appsettings.json
@@ -8,8 +8,8 @@
   },
   "AllowedHosts": "*",
   "GoogleAnalyticsCode": "",
-  "APIRoot": "https://api.ganjoor.net",
-  "GlobalAPIRoot": "https://api.ganjoor.net",
+  "APIRoot": "http://localhost:3439",
+  "GlobalAPIRoot": "http://localhost:3439",
   "SiteUrl": "http://localhost:33081",
   "MockSpotify": "False",
   "AggressiveCacheEnabled": "False",
diff --git a/RMuseum/Models/FAQ/FAQCategory.cs b/RMuseum/Models/FAQ/FAQCategory.cs
index 6b5d3fa4..ff312690 100644
--- a/RMuseum/Models/FAQ/FAQCategory.cs
+++ b/RMuseum/Models/FAQ/FAQCategory.cs
@@ -1,4 +1,7 @@
-namespace RMuseum.Models.FAQ
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace RMuseum.Models.FAQ
 {
     /// <summary>
     /// FAQ Category
@@ -29,5 +32,11 @@
         /// published
         /// </summary>
         public bool Published { get; set; }
+
+        /// <summary>
+        /// category items
+        /// </summary>
+        [NotMapped]
+        public List<FAQItem> Items { get; set; }
     }
 }
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index f3892d3c..fe0633cf 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -3932,6 +3932,11 @@
             published
             </summary>
         </member>
+        <member name="P:RMuseum.Models.FAQ.FAQCategory.Items">
+            <summary>
+            category items
+            </summary>
+        </member>
         <member name="T:RMuseum.Models.FAQ.FAQItem">
             <summary>
             FAQ Item
diff --git a/RMuseum/Services/Implementation/FAQService.cs b/RMuseum/Services/Implementation/FAQService.cs
index 81f112ee..674659a9 100644
--- a/RMuseum/Services/Implementation/FAQService.cs
+++ b/RMuseum/Services/Implementation/FAQService.cs
@@ -114,9 +114,10 @@ namespace RMuseum.Services.Implementation
         /// <returns></returns>
         public async Task<RServiceResult<FAQItem[]>> GetPinnedItemsAsync(bool onlyPublished)
         {
+            var items = await _context.FAQItems.Where(c => c.Pinned && (c.Published == onlyPublished || c.Published == true)).OrderBy(c => c.PinnedItemOrder).ToArrayAsync();
             return new RServiceResult<FAQItem[]>
                 (
-                await _context.FAQItems.Where(c => c.Pinned && (c.Published == onlyPublished || c.Published == true)).OrderBy(c => c.PinnedItemOrder).ToArrayAsync()
+                items
                 );
         }
 
@@ -128,9 +129,10 @@ namespace RMuseum.Services.Implementation
         /// <returns></returns>
         public async Task<RServiceResult<FAQItem[]>> GetCategoryItemsAsync(int categoryId, bool onlyPublished)
         {
+            var items = await _context.FAQItems.Where(c => c.CategoryId == categoryId && (c.Published == onlyPublished || c.Published == true)).OrderBy(c => c.ItemOrderInCategory).ToArrayAsync();
             return new RServiceResult<FAQItem[]>
                 (
-                await _context.FAQItems.Where(c => c.CategoryId == categoryId && (c.Published == onlyPublished || c.Published == true)).OrderBy(c => c.ItemOrderInCategory).ToArrayAsync()
+                items
                 );
         }
 
diff --git a/RMuseum/appsettings.json b/RMuseum/appsettings.json
index 41804b7c..2a577c40 100644
--- a/RMuseum/appsettings.json
+++ b/RMuseum/appsettings.json
@@ -6,7 +6,7 @@
     "ApplicationName": "Ganjoor",
     "FirstUserEmail": "admin@ganjoor.net"
   },
-  "DatabaseMigrate": "False",
+  "DatabaseMigrate": "True",
   "AggressiveCacheEnabled": "False",
   "PictureFileService": {
     "StoragePath": "C:\\museum",