diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs
index 290da79157..8f56902ab7 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using Volo.Abp.Cli.Commands;
 using Volo.Abp.Cli.ProjectBuilding.Building;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
@@ -193,6 +195,30 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 "MyProjectNameEntityFrameworkCoreCollectionFixtureBase",
                 "MyProjectNameMongoDbCollectionFixtureBase"
             );
+
+            if (context.BuildArgs.PublicWebSite)
+            {
+                ChangeProjectReference(
+                    context,
+                    "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Public/MyCompanyName.MyProjectName.Web.Public.csproj",
+                    "EntityFrameworkCore.DbMigrations",
+                    "MongoDB"
+                );
+
+                ChangeNamespaceAndKeyword(
+                    context,
+                    "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Public/MyProjectNameWebPublicModule.cs",
+                    "MyCompanyName.MyProjectName.EntityFrameworkCore",
+                    "MyCompanyName.MyProjectName.MongoDB",
+                    "MyProjectNameEntityFrameworkCoreDbMigrationsModule",
+                    "MyProjectNameMongoDbModule"
+                );
+
+                ChangeConnectionStringToMongoDb(
+                    context,
+                    "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Public/appsettings.json"
+                );
+            }
         }
 
         private void ChangeProjectReference(
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
index 9c6a346921..d16630d7be 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
@@ -87,7 +87,7 @@
                 data: "author.userName",
                 render: function (data) {
                     if (data !== null) {
-                        return GetFilterableDatatableContent('#Author', data);
+                        return GetFilterableDatatableContent('#Author', $.fn.dataTable.render.text().display(data)); //prevent against possible XSS
                     }
                     return "";
                 }
@@ -97,7 +97,7 @@
                 data: "text",
                 orderable: false,
                 render: function (data) {
-                    data = data || "";
+                    data = $.fn.dataTable.render.text().display(data || "");
 
                     var maxChars = 64;
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
index 069a3983ec..9fe250b8b9 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
@@ -87,7 +87,7 @@
                 data: "author.userName",
                 render: function (data) {
                     if (data !== null) {
-                        return GetFilterableDatatableContent('#Author', data);
+                        return GetFilterableDatatableContent('#Author', $.fn.dataTable.render.text().display(data)); //prevent against possible XSS
                     }
                     return "";
                 }
@@ -99,7 +99,7 @@
                 data: "entityType",
                 render: function (data) {
                     if (data !== null) {
-                        return GetFilterableDatatableContent('#EntityType', data);
+                        return GetFilterableDatatableContent('#EntityType', $.fn.dataTable.render.text().display(data));
                     }
                     return "";
                 }
@@ -109,7 +109,7 @@
                 data: "text",
                 orderable: false,
                 render: function (data) {
-                    data = data || "";
+                    data = $.fn.dataTable.render.text().display(data || "");
 
                     var maxChars = 64;
 
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
index d66d7240e3..e25bc64354 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
@@ -84,7 +84,7 @@
                         title: l('RoleName'),
                         data: 'name',
                         render: function (data, type, row) {
-                            var name = '<span>' + data + '</span>';
+                            var name = '<span>' + $.fn.dataTable.render.text().display(data) + '</span>'; //prevent against possible XSS
                             if (row.isDefault) {
                                 name +=
                                     '<span class="badge badge-pill badge-success ml-1">' +