diff --git a/src/Plugins/Authentication.Google/Views/Shared/Components/GoogleAuthentication/Default.cshtml b/src/Plugins/Authentication.Google/Views/Shared/Components/GoogleAuthentication/Default.cshtml
index 6ce6dbd04..2c8df346d 100644
--- a/src/Plugins/Authentication.Google/Views/Shared/Components/GoogleAuthentication/Default.cshtml
+++ b/src/Plugins/Authentication.Google/Views/Shared/Components/GoogleAuthentication/Default.cshtml
@@ -4,6 +4,6 @@
 <link rel="stylesheet" type="text/css" asp-src="/Plugins/Authentication.Google/Assets/googlestyles.css"/>
 <div class="google-login-block">
     <div class="buttons">
-        <a asp-controller="GoogleAuthentication" asp-action="GoogleLogin" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" class="google-btn"></a>
+        <a asp-controller="GoogleAuthentication" asp-action="GoogleLogin" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" class="google-btn"></a>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Plugins/Authentication.Google/Views/_ViewImports.cshtml b/src/Plugins/Authentication.Google/Views/_ViewImports.cshtml
index fb3b84aa9..8a04d32e5 100644
--- a/src/Plugins/Authentication.Google/Views/_ViewImports.cshtml
+++ b/src/Plugins/Authentication.Google/Views/_ViewImports.cshtml
@@ -4,6 +4,7 @@
 
 @using Microsoft.AspNetCore.Mvc.ViewFeatures
 @using Grand.Infrastructure.Extensions
+@using Grand.Web.Common.Extensions
 @using Grand.Web.Common.Localization
 
 @inject LocService Loc
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml
index 302ce79be..4e42d98bd 100644
--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml
+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml
@@ -3,9 +3,9 @@
 }
 @model Shipping.ByWeight.Models.ShippingByWeightModel
 <form id="AddPopup" asp-controller="ShippingByWeight" asp-action="AddPopup" method="post"
-      asp-route-ShippingByWeightId="@Context.Request.Query["ShippingByWeightId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ShippingByWeightId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ShippingByWeightId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml
index 312dda14d..ab2c5fcd9 100644
--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml
+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml
@@ -3,9 +3,9 @@
 }
 @model Shipping.ByWeight.Models.ShippingByWeightModel
 <form id="EditPopup" asp-controller="ShippingByWeight" asp-action="EditPopup" method="post"
-      asp-route-ShippingByWeightId="@Context.Request.Query["ShippingByWeightId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ShippingByWeightId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ShippingByWeightId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/_ViewImports.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/_ViewImports.cshtml
index 52adbfe6d..627456f7d 100644
--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/_ViewImports.cshtml
+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/_ViewImports.cshtml
@@ -5,6 +5,7 @@
 @using Microsoft.AspNetCore.Mvc.ViewFeatures
 @using Grand.Infrastructure.Extensions
 @using Grand.Web.Common
+@using Grand.Web.Common.Extensions
 @using Grand.Web.Common.Localization
 
 @inject LocService Loc
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml
index f91d1340b..842a6e9af 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml
@@ -4,9 +4,9 @@
 @model Shipping.ShippingPoint.Models.ShippingPointModel
 
 <form id="CreatePopup" asp-controller="ShippingPoint" asp-action="Create" method="post"
-      asp-route-ShippingPointId="@Context.Request.Query["ShippingPointId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ShippingPointId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ShippingPointId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml
index d49be067c..4e1c5b98f 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml
@@ -4,9 +4,9 @@
 @model Shipping.ShippingPoint.Models.ShippingPointModel
 
 <form id="EditPopup" asp-controller="ShippingPoint" asp-action="Edit" method="post"
-      asp-route-ShippingPointId="@Context.Request.Query["ShippingPointId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ShippingPointId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ShippingPointId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/_ViewImports.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/_ViewImports.cshtml
index 0d1dc3574..a5cf2e72a 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/_ViewImports.cshtml
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/_ViewImports.cshtml
@@ -5,5 +5,6 @@
 @using Microsoft.AspNetCore.Mvc.ViewFeatures
 @using Grand.Infrastructure.Extensions
 @using Grand.Web.Common
+@using Grand.Web.Common.Extensions
 @using Grand.Web.Common.Localization
 @inject LocService Loc
\ No newline at end of file
diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml
index c8cb205d9..caa7c45a6 100644
--- a/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml
+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml
@@ -18,7 +18,7 @@
             @* login main block *@
             <div class="col-12 mx-lg-0 mx-auto mt-3">
                 <validation-observer v-slot="{ handleSubmit }">
-                    <form asp-route="Login" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)" method="post">
+                    <form asp-route="Login" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)" method="post">
                         <div class="card">
                             <div class="card-header">
                                 <h3 class="h5 mb-0 text-center">
diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Register.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Register.cshtml
index 233cdc1c0..cc78f7bb0 100644
--- a/src/Plugins/Theme.Modern/Views/Modern/Account/Register.cshtml
+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Register.cshtml
@@ -65,7 +65,7 @@
 </script>
 
 <validation-observer v-slot="{ handleSubmit }">
-<form asp-route="Register" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
+<form asp-route="Register" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
 <div class="page registration-page">
 <div asp-validation-summary="All" class="message-error"></div>
 <div class="card my-3">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml
index 3891518dc..4c8803ee8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml
@@ -4,7 +4,7 @@
     ViewBag.Title = Loc["Admin.Address.AddressAttributes.Values.AddNew"];
 }
 <form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueCreatePopup"
-      asp-route-addressAttributeId="@Context.Request.Query["addressAttributeId"]">
+      asp-route-addressAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["addressAttributeId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
index 1c0ef6537..60ff60bbd 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
@@ -7,9 +7,9 @@
     ViewBag.Title = Loc["Admin.Content.Blog.BlogCategory.AddNewPost"];
 }
 <form id="BlogPostAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="BlogPostAddPopup" method="post"
-      asp-route-CategoryId="@Context.Request.Query["CategoryId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-CategoryId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["CategoryId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
index eeee12877..1a84916d9 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
@@ -7,9 +7,9 @@
 }
 
 <form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="ProductAddPopup" method="post"
-      asp-route-BlogPostId="@Context.Request.Query["BlogPostId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-BlogPostId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["BlogPostId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml
index 1d8053077..e01680c56 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml
@@ -7,9 +7,9 @@
     ViewBag.Title = Loc["Admin.Catalog.Categories.Products.AddNew"];
 }
 <form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Category" asp-action="ProductAddPopup" method="post"
-      asp-route-CategoryId="@Context.Request.Query["CategoryId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-CategoryId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["CategoryId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml
index 051739215..150882ab4 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml
@@ -5,7 +5,7 @@
 @model CheckoutAttributeValueModel
 
 <form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"
-      asp-route-checkoutAttributeId="@Context.Request.Query["checkoutAttributeId"]">
+      asp-route-checkoutAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["checkoutAttributeId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml
index 9776e9d8e..4ca28c2bc 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml
@@ -3,7 +3,7 @@
     Layout = "";
 }
 <form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"
-      asp-route-checkoutAttributeId="@Context.Request.Query["checkoutAttributeId"]">
+      asp-route-checkoutAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["checkoutAttributeId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml
index 81c232a63..c097c28b1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml
@@ -7,9 +7,9 @@
 }
 
 <form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Collection" asp-action="ProductAddPopup" method="post"
-      asp-route-CollectionId="@Context.Request.Query["CollectionId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-CollectionId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["CollectionId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml
index 45d977e40..dcacc6653 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml
@@ -4,7 +4,7 @@
 
 @model ContactAttributeValueModel
 <form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"
-      asp-route-contactAttributeId="@Context.Request.Query["contactAttributeId"]">
+      asp-route-contactAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["contactAttributeId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml
index ad4dbfb57..d4ca5bf20 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml
@@ -3,7 +3,7 @@
     Layout = "";
 }
 <form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueEditPopup"
-      asp-route-contactAttributeId="@Context.Request.Query["contactAttributeId"]">
+      asp-route-contactAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["contactAttributeId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml
index dc11e8886..a98ab72c1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml
@@ -3,7 +3,7 @@
     Layout = "";
 }
 <form id="StateCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateCreatePopup"
-      asp-route-countryId="@Context.Request.Query["countryId"]">
+      asp-route-countryId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["countryId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml
index c315b2980..082478a45 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml
@@ -3,7 +3,7 @@
     Layout = "";
 }
 <form id="StateEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateEditPopup"
-      asp-route-countryId="@Context.Request.Query["countryId"]">
+      asp-route-countryId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["countryId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
index 618538c1a..02db032d1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
@@ -7,10 +7,10 @@
 }
 
 <form asp-area="@Constants.AreaAdmin" asp-controller="Course" asp-action="AssociateProductToCoursePopup" method="post"
-      asp-route-CustomerGroupId="@Context.Request.Query["CourseId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-productIdInput="@Context.Request.Query["productIdInput"]"
-      asp-route-productNameInput="@Context.Request.Query["productNameInput"]"
+      asp-route-CustomerGroupId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["CourseId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-productIdInput="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productIdInput"])"
+      asp-route-productNameInput="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productNameInput"])"
       id="associateproduct">
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
index f68882d58..7329ebeaf 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
@@ -7,10 +7,10 @@
 }
 
 <form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Customer" asp-action="ProductAddPopup" method="post"
-      asp-route-CustomerId="@Context.Request.Query["CustomerId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]"
-      asp-route-personalized="@Context.Request.Query["personalized"]">
+      asp-route-CustomerId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["CustomerId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])"
+      asp-route-personalized="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["personalized"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml
index 40a25a248..8f59215fc 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml
@@ -5,9 +5,9 @@
     ViewBag.Title = Loc["Admin.Customers.CustomerAttributes.Values.AddNew"];
 }
 <form id="ValueCreatePopup" manifest="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueCreatePopup"
-      asp-route-customerAttributeId="@Context.Request.Query["customerAttributeId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-customerAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["customerAttributeId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml
index c667a0768..7c1bddb36 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml
@@ -9,9 +9,9 @@
     ViewBag.Title = Loc["Admin.Customers.CustomerAttributes.Values.EditValueDetails"];
 }
 <form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueEditPopup"
-      asp-route-customerAttributeId="@Context.Request.Query["customerAttributeId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-customerAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["customerAttributeId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
index fe659d151..fc33a034a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Admin.Customers.CustomerGroups.Products.AddNew"];
 }
 <form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerGroup" asp-action="ProductAddPopup" method="post"
-      asp-route-CustomerGroupId="@Context.Request.Query["CustomerGroupId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-CustomerGroupId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["CustomerGroupId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml
index 90511e9d2..596c42a52 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml
@@ -7,9 +7,9 @@
 @inject AdminAreaSettings adminAreaSettings
 
 <form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerTag" asp-action="ProductAddPopup" method="post"
-      asp-route-CustomerTagId="@Context.Request.Query["CustomerTagId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-CustomerTagId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["CustomerTagId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
index dfc677dae..3c2114ba2 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
@@ -7,9 +7,9 @@
 }
 
 <form id="BrandAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="BrandAddPopup" method="post"
-      asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
index 3108a8e8a..aa49a9c32 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
@@ -7,9 +7,9 @@
 }
 
 <form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"
-      asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
index eb704bb24..f42c3583f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
@@ -9,9 +9,9 @@
 }
 
 <form id="CollectionAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"
-      asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml
index dbee7cd0d..744357c5d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml
@@ -7,9 +7,9 @@
 }
 
 <form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="ProductAddPopup" method="post"
-      asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
index eb4dbf6f9..7604c9870 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
@@ -7,9 +7,9 @@
 }
 
 <form id="VendorAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="VendorAddPopup" method="post"
-      asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
index 8f598aba3..1e4f22d92 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
@@ -5,9 +5,9 @@
     Layout = "";
 }
 <form id="ArticlesPopup" asp-area="@Constants.AreaAdmin" asp-controller="Knowledgebase" asp-action="ArticlesPopup" method="post"
-      asp-route-KnowledgebaseId="@Context.Request.Query["KnowledgebaseId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-KnowledgebaseId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["KnowledgebaseId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <input asp-for="ArticleId" type="hidden"/>
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Create.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Create.cshtml
index 511003c8d..12419ebfc 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Create.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Create.cshtml
@@ -3,7 +3,7 @@
     //page title
     ViewBag.Title = Loc["Admin.Configuration.Menu.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="Menu" asp-action="Create" method="post" asp-route-parentId="@Context.Request.Query["parentId"]">
+<form asp-area="@Constants.AreaAdmin" asp-controller="Menu" asp-action="Create" method="post" asp-route-parentId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["parentId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddressEdit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddressEdit.cshtml
index 07eb7314a..a1b8c29ff 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddressEdit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddressEdit.cshtml
@@ -4,9 +4,9 @@
     ViewBag.Title = Loc["Admin.Orders.Address.EditAddress"];
 }
 <form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="AddressEdit"
-      asp-route-addressId="@Context.Request.Query["addressId"]"
-      asp-route-billingAddress="@Context.Request.Query["BillingAddress"]"
-      asp-route-orderId="@Context.Request.Query["orderId"]">
+      asp-route-addressId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["addressId"])"
+      asp-route-billingAddress="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["BillingAddress"])"
+      asp-route-orderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["orderId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
index 8c5337431..dddb2cc72 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
@@ -5,10 +5,10 @@
 }
 @model PaymentTransactionModel
 <form id="PartiallyPaidPopup" asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyPaidPopup" method="post"
-      asp-route-OrderId="@Context.Request.Query["Id"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-online="@Context.Request.Query["online"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-OrderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-online="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["online"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <input asp-for="Id" type="hidden"/>
     <input asp-for="MaxAmountToPaid" type="hidden"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
index 567e41710..7ea695379 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
@@ -5,10 +5,10 @@
 }
 @model PaymentTransactionModel
 <form id="PartiallyRefundPopup" asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyRefundPopup" method="post"
-      asp-route-OrderId="@Context.Request.Query["Id"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-online="@Context.Request.Query["online"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-OrderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-online="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["online"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <input asp-for="Id" type="hidden"/>
     <input asp-for="MaxAmountToRefund" type="hidden"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociateProductToAttributeValuePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociateProductToAttributeValuePopup.cshtml
index b4b47b4dc..c6204bb47 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociateProductToAttributeValuePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociateProductToAttributeValuePopup.cshtml
@@ -7,8 +7,8 @@
 }
 
 <form asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="AssociateProductToAttributeValuePopup"
-      asp-route-productIdInput="@Context.Request.Query["productIdInput"]"
-      asp-route-productNameInput="@Context.Request.Query["productNameInput"]" id="associateproduct">
+      asp-route-productIdInput="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productIdInput"])"
+      asp-route-productNameInput="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productNameInput"])" id="associateproduct">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml
index 81e84401c..adac34c4c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml
@@ -7,9 +7,9 @@
 }
 
 <form id="AssociatedProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="AssociatedProductAddPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
index 57501f5ee..92a8d18c2 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
@@ -9,10 +9,10 @@
     ViewBag.Title = string.IsNullOrEmpty(Model.Id) ? Loc["Admin.Catalog.Products.ProductAttributes.AttributeCombinations.AddTitle"] : Loc["Admin.Catalog.Products.ProductAttributes.AttributeCombinations.Update"];
 }
 <form id="AttributeCombinationPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="AttributeCombinationPopup" enctype="multipart/form-data"
-      asp-route-productId="@Context.Request.Query["productId"]"
-      asp-route-Id="@Context.Request.Query["Id"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-productId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productId"])"
+      asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
 <div asp-validation-summary="All"></div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml
index c028a319d..80ae8d649 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml
@@ -7,9 +7,9 @@
     ViewBag.Title = Loc["Admin.Catalog.Products.BundleProducts.AddNew"];
 }
 <form id="BundleProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="BundleProductAddPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml
index d9d9f1c9b..2b5c6b71c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Admin.Catalog.Products.CrossSells.AddNew"];
 }
 <form id="CrossSellProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="CrossSellProductAddPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml
index 6593049fa..f9012f5a4 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml
@@ -4,10 +4,10 @@
     ViewBag.Title = Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Condition"];
 }
 <form id="ProductAttributeConditionPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="ProductAttributeConditionPopup" enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-productAttributeMappingId="@Context.Request.Query["ProductAttributeMappingId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div asp-validation-summary="All"></div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml
index bb8e716dd..a08a7d827 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml
@@ -5,10 +5,10 @@
     ViewBag.Title = Loc["Admin.Catalog.Products.ProductAttributes.Details"];
 }
 <form id="ProductAttributeMappingPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="ProductAttributeMappingPopup" enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-productAttributeMappingId="@Context.Request.Query["ProductAttributeMappingId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div asp-validation-summary="All"></div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml
index 5c963843a..46e2c184b 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml
@@ -7,9 +7,9 @@
     var attributeControlType = Model.AttributeControlTypeId;
 }
 <form id="ProductAttributeValidationRulesPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="ProductAttributeValidationRulesPopup" enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueCreatePopup.cshtml
index 24c80e3cc..24a392b4f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueCreatePopup.cshtml
@@ -5,10 +5,10 @@
     ViewBag.Title = Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.AddNew"];
 }
 <form id="ProductAttributeValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="ProductAttributeValueCreatePopup" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-productAttributeMappingId="@Context.Request.Query["ProductAttributeMappingId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml
index 88ec72519..187584377 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml
@@ -5,10 +5,10 @@
 }
 @model ProductModel.ProductAttributeValueModel
 <form id="ProductAttributeValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="ProductAttributeValueEditPopup" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-productAttributeMappingId="@Context.Request.Query["ProductAttributeMappingId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
index d0c50a205..8f4de15f9 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
@@ -4,10 +4,10 @@
     Layout = "";
 }
 <form id="ProductPicturePopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="ProductPicturePopup" enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-Id="@Context.Request.Query["Id"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <!-- #region languages template -->
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml
index 6090f67ae..b9a3c24ff 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml
@@ -5,8 +5,8 @@
 <form id="ProductSpecificationPopup" asp-area="@Constants.AreaAdmin"
       asp-controller="Product" asp-action="ProductSpecAttrPopup"
       enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-Id="@Context.Request.Query["Id"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])">
 
     <div asp-validation-summary="All"></div>
     <input asp-for="ProductId" type="hidden"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml
index bf5ef6da0..1a55ffa37 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Admin.Catalog.Products.Recommended.AddNew"];
 }
 <form id="RecommendedProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="RecommendedProductAddPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml
index a054608e9..27144de2d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Admin.Catalog.Products.RelatedProducts.AddNew"];
 }
 <form id="RelatedProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="RelatedProductAddPopup"
-      asp-route-productId="@Context.Request.Query["productId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-productId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/SimilarProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/SimilarProductAddPopup.cshtml
index 9de120e56..d26e5564a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/SimilarProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/SimilarProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Admin.Catalog.Products.SimilarProducts.AddNew"];
 }
 <form id="SimilarProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="SimilarProductAddPopup"
-      asp-route-productId="@Context.Request.Query["productId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-productId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceCreatePopup.cshtml
index 7c6cf97df..33a330258 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceCreatePopup.cshtml
@@ -8,9 +8,9 @@
 }
 
 <form id="TierPriceCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="TierPriceCreatePopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceEditPopup.cshtml
index de0593428..6cfd03c6f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceEditPopup.cshtml
@@ -8,9 +8,9 @@
 }
 
 <form id="TierPriceEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="TierPriceEditPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Edit.cshtml
index 0e9dece25..c73733c41 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Edit.cshtml
@@ -3,7 +3,7 @@
     //page title
     ViewBag.Title = Loc["Admin.Catalog.ProductReviews.EditProductReviewDetails"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="ProductReview" asp-action="Edit" method="post" asp-route-ProductId="@Context.Request.Query["ProductId"]">
+<form asp-area="@Constants.AreaAdmin" asp-controller="ProductReview" asp-action="Edit" method="post" asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/AddShipment.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/AddShipment.cshtml
index 69d13fc8c..cf0cd20ce 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/AddShipment.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/AddShipment.cshtml
@@ -4,7 +4,7 @@
     ViewBag.Title = string.Format(Loc["Admin.Orders.Shipments.AddNew.Title"], Model.OrderId);
 }
 <form asp-area="@Constants.AreaAdmin" asp-controller="Shipment" asp-action="AddShipment" method="post"
-      asp-route-orderId="@Context.Request.Query["orderId"]">
+      asp-route-orderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["orderId"])">
 
     <div asp-validation-summary="All"></div>
     <input type="hidden" asp-for="@Model.OrderId"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml
index 3f3286a6c..e87e265ef 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml
@@ -7,7 +7,7 @@
     ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"];
 }
 <form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="OptionCreatePopup"
-      method="post" id="specificationattribute-form" asp-route-Id="@Context.Request.Query["Id"]">
+      method="post" id="specificationattribute-form" asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml
index 2cf3f5fcd..a76dba87f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml
@@ -7,7 +7,7 @@
     ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.EditOptionDetails"];
 }
 <form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="OptionEditPopup" method="post" id="specificationattribute-form"
-      asp-route-SpecificationAttributeId="@Context.Request.Query["SpecificationAttributeId"]">
+      asp-route-SpecificationAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["SpecificationAttributeId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Common/Extensions/HtmlExtensions.cs b/src/Web/Grand.Web.Common/Extensions/HtmlExtensions.cs
index 6e67bccaf..52f713b3d 100644
--- a/src/Web/Grand.Web.Common/Extensions/HtmlExtensions.cs
+++ b/src/Web/Grand.Web.Common/Extensions/HtmlExtensions.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Html;
+using System.Net;
 using System.Text.Encodings.Web;
 
 namespace Grand.Web.Common.Extensions;
@@ -25,6 +26,10 @@ public static string ToHtmlString(this IHtmlContent tag)
         tag.WriteTo(writer, HtmlEncoder.Default);
         return writer.ToString();
     }
+    public static string HtmlEncodeSafe(string input)
+    {
+        return string.IsNullOrEmpty(input) ? string.Empty : WebUtility.HtmlEncode(input);
+    }
 
     #endregion
 }
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociateProductToAttributeValuePopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociateProductToAttributeValuePopup.cshtml
index 28875a17f..4b11a5dad 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociateProductToAttributeValuePopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociateProductToAttributeValuePopup.cshtml
@@ -7,8 +7,8 @@
 }
 
 <form asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="AssociateProductToAttributeValuePopup"
-      asp-route-productIdInput="@Context.Request.Query["productIdInput"]"
-      asp-route-productNameInput="@Context.Request.Query["productNameInput"]" id="associateproduct">
+      asp-route-productIdInput="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productIdInput"])"
+      asp-route-productNameInput="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productNameInput"])" id="associateproduct">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociatedProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociatedProductAddPopup.cshtml
index 818f00153..d32d7fcab 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociatedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociatedProductAddPopup.cshtml
@@ -7,9 +7,9 @@
 }
 
 <form id="AssociatedProductAddPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="AssociatedProductAddPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AttributeCombinationPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AttributeCombinationPopup.cshtml
index dfe88a148..2cb621287 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AttributeCombinationPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AttributeCombinationPopup.cshtml
@@ -4,10 +4,10 @@
     ViewBag.Title = string.IsNullOrEmpty(Model.Id) ? Loc["Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.AddTitle"] : Loc["Vendor.Catalog.Products.ProductAttributes.AttributeCombinations.Update"];
 }
 <form id="AttributeCombinationPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="AttributeCombinationPopup" enctype="multipart/form-data"
-      asp-route-productId="@Context.Request.Query["productId"]"
-      asp-route-Id="@Context.Request.Query["Id"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-productId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productId"])"
+      asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
 <div asp-validation-summary="All"></div>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/BundleProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/BundleProductAddPopup.cshtml
index 11be8d781..24e8c7d5c 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/BundleProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/BundleProductAddPopup.cshtml
@@ -7,9 +7,9 @@
     ViewBag.Title = Loc["Vendor.Catalog.Products.BundleProducts.AddNew"];
 }
 <form id="BundleProductAddPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="BundleProductAddPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/CrossSellProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/CrossSellProductAddPopup.cshtml
index f82c1fe1c..373e62eb2 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/CrossSellProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/CrossSellProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Vendor.Catalog.Products.CrossSells.AddNew"];
 }
 <form id="CrossSellProductAddPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="CrossSellProductAddPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeConditionPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeConditionPopup.cshtml
index 98ffd2cf8..2b02275dd 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeConditionPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeConditionPopup.cshtml
@@ -4,10 +4,10 @@
     ViewBag.Title = Loc["Vendor.Catalog.Products.ProductAttributes.Attributes.Condition"];
 }
 <form id="ProductAttributeConditionPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="ProductAttributeConditionPopup" enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-productAttributeMappingId="@Context.Request.Query["ProductAttributeMappingId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div asp-validation-summary="All"></div>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeMappingPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeMappingPopup.cshtml
index 8e934ac1c..e6b7d0f7f 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeMappingPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeMappingPopup.cshtml
@@ -5,10 +5,10 @@
     ViewBag.Title = Loc["Vendor.Catalog.Products.ProductAttributes.Details"];
 }
 <form id="ProductAttributeMappingPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="ProductAttributeMappingPopup" enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-productAttributeMappingId="@Context.Request.Query["ProductAttributeMappingId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div asp-validation-summary="All"></div>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValidationRulesPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValidationRulesPopup.cshtml
index fecb211d5..de5e48cf6 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValidationRulesPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValidationRulesPopup.cshtml
@@ -7,9 +7,9 @@
     var attributeControlType = Model.AttributeControlTypeId;
 }
 <form id="ProductAttributeValidationRulesPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="ProductAttributeValidationRulesPopup" enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueCreatePopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueCreatePopup.cshtml
index 496604be2..9e3cff0d9 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueCreatePopup.cshtml
@@ -5,10 +5,10 @@
     ViewBag.Title = Loc["Vendor.Catalog.Products.ProductAttributes.Attributes.Values.AddNew"];
 }
 <form id="ProductAttributeValueCreatePopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="ProductAttributeValueCreatePopup" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-productAttributeMappingId="@Context.Request.Query["ProductAttributeMappingId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueEditPopup.cshtml
index edca9d647..ce676d3c6 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeValueEditPopup.cshtml
@@ -5,10 +5,10 @@
 }
 @model ProductModel.ProductAttributeValueModel
 <form id="ProductAttributeValueEditPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="ProductAttributeValueEditPopup" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-productAttributeMappingId="@Context.Request.Query["ProductAttributeMappingId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-productAttributeMappingId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductAttributeMappingId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductPicturePopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductPicturePopup.cshtml
index 4ec4b2540..7b210cbc2 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductPicturePopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductPicturePopup.cshtml
@@ -4,10 +4,10 @@
     Layout = "";
 }
 <form id="ProductPicturePopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="ProductPicturePopup" enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-Id="@Context.Request.Query["Id"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <!-- #region languages template -->
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductSpecAttrPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductSpecAttrPopup.cshtml
index 8b9ca94f1..a23923282 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductSpecAttrPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductSpecAttrPopup.cshtml
@@ -5,8 +5,8 @@
 <form id="ProductSpecificationPopup" asp-area="@Constants.AreaVendor"
       asp-controller="Product" asp-action="ProductSpecAttrPopup"
       enctype="multipart/form-data" method="post"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-Id="@Context.Request.Query["Id"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])">
 
     <div asp-validation-summary="All"></div>
     <input asp-for="ProductId" type="hidden"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RecommendedProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RecommendedProductAddPopup.cshtml
index 2dd8f866d..e84e7bfde 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RecommendedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RecommendedProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Vendor.Catalog.Products.Recommended.AddNew"];
 }
 <form id="RecommendedProductAddPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="RecommendedProductAddPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RelatedProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RelatedProductAddPopup.cshtml
index 1638229ad..d5d1a39c6 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RelatedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RelatedProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Vendor.Catalog.Products.RelatedProducts.AddNew"];
 }
 <form id="RelatedProductAddPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="RelatedProductAddPopup"
-      asp-route-productId="@Context.Request.Query["productId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-productId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
 
     <div class="row">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/SimilarProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/SimilarProductAddPopup.cshtml
index 0bfe60121..b0a8f278b 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/SimilarProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/SimilarProductAddPopup.cshtml
@@ -6,9 +6,9 @@
     ViewBag.Title = Loc["Vendor.Catalog.Products.SimilarProducts.AddNew"];
 }
 <form id="SimilarProductAddPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="SimilarProductAddPopup"
-      asp-route-productId="@Context.Request.Query["productId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-productId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["productId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/TierPriceCreatePopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/TierPriceCreatePopup.cshtml
index 3b445e4fe..5d87d3aac 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/TierPriceCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/TierPriceCreatePopup.cshtml
@@ -8,9 +8,9 @@
 }
 
 <form id="TierPriceCreatePopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="TierPriceCreatePopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/TierPriceEditPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/TierPriceEditPopup.cshtml
index 6c24e0dfc..fc5ae7807 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/TierPriceEditPopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/TierPriceEditPopup.cshtml
@@ -8,9 +8,9 @@
 }
 
 <form id="TierPriceEditPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="TierPriceEditPopup"
-      asp-route-ProductId="@Context.Request.Query["ProductId"]"
-      asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
+      asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"
+      asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
+      asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
 
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/AddShipment.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/AddShipment.cshtml
index a9784c10d..9f9c1bf91 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/AddShipment.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/AddShipment.cshtml
@@ -4,7 +4,7 @@
     ViewBag.Title = string.Format(Loc["Vendor.Orders.Shipments.AddNew.Title"], Model.OrderId);
 }
 <form asp-area="@Constants.AreaVendor" asp-controller="Shipment" asp-action="AddShipment" method="post"
-      asp-route-orderId="@Context.Request.Query["orderId"]">
+      asp-route-orderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["orderId"])">
 
     <div asp-validation-summary="All"></div>
     <input type="hidden" asp-for="@Model.OrderId"/>
diff --git a/src/Web/Grand.Web/Views/Account/EnableTwoFactorAuthenticator.cshtml b/src/Web/Grand.Web/Views/Account/EnableTwoFactorAuthenticator.cshtml
index 17513d622..df6254274 100644
--- a/src/Web/Grand.Web/Views/Account/EnableTwoFactorAuthenticator.cshtml
+++ b/src/Web/Grand.Web/Views/Account/EnableTwoFactorAuthenticator.cshtml
@@ -43,7 +43,7 @@
                                 @Loc["Account.TwoFactorAuth.ManualSetupCode"] @(Model.CustomValues[code])
                             </div>
                         </div>
-                        <form asp-route="EnableTwoFactorAuthorization" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post">
+                        <form asp-route="EnableTwoFactorAuthorization" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" method="post">
                             <input asp-for="SecretKey" type="hidden"/>
                             <input asp-for="TwoFactorAuthenticationType" type="hidden"/>
                             <input asp-for="@Model.CustomValues[code]" type="hidden"/>
@@ -82,7 +82,7 @@
             <div class="row flex-md-row mt-3 mb-3">
                 <div class="col-lg-6 col-12 text-center">
                     <div class="card">
-                        <form asp-route="EnableTwoFactorAuthorization" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post">
+                        <form asp-route="EnableTwoFactorAuthorization" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" method="post">
                             <input asp-for="SecretKey" type="hidden"/>
                             <input asp-for="TwoFactorAuthenticationType" type="hidden"/>
                             <div class="card-body">
@@ -119,7 +119,7 @@
             <div class="row flex-md-row mt-3 mb-3">
                 <div class="col-lg-6 col-12 text-center">
                     <div class="card">
-                        <form asp-route="EnableTwoFactorAuthorization" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post">
+                        <form asp-route="EnableTwoFactorAuthorization" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" method="post">
                             <input asp-for="SecretKey" type="hidden"/>
                             <input asp-for="TwoFactorAuthenticationType" type="hidden"/>
                             <div class="card-body">
diff --git a/src/Web/Grand.Web/Views/Account/Login.cshtml b/src/Web/Grand.Web/Views/Account/Login.cshtml
index d69afbec0..43a79707d 100644
--- a/src/Web/Grand.Web/Views/Account/Login.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Login.cshtml
@@ -16,7 +16,7 @@
             @* login main block *@
             <div class="col-12 mx-lg-0 mx-auto mt-3">
                 <validation-observer v-slot="{ handleSubmit }">
-                    <form asp-route="Login" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)" method="post">
+                    <form asp-route="Login" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)" method="post">
                         <div class="card">
                             <div class="card-header">
                                 <h3 class="h5 mb-0 text-center">
diff --git a/src/Web/Grand.Web/Views/Account/PasswordRecoveryConfirm.cshtml b/src/Web/Grand.Web/Views/Account/PasswordRecoveryConfirm.cshtml
index 0fa5b29f3..ce4717594 100644
--- a/src/Web/Grand.Web/Views/Account/PasswordRecoveryConfirm.cshtml
+++ b/src/Web/Grand.Web/Views/Account/PasswordRecoveryConfirm.cshtml
@@ -14,7 +14,7 @@
     }
     @if (!Model.DisablePasswordChanging)
     {
-        <form asp-route="PasswordRecoveryConfirm" asp-route-token="@Context.Request.Query["token"]" asp-route-email="@Context.Request.Query["email"]" method="post" autocomplete="off">
+        <form asp-route="PasswordRecoveryConfirm" asp-route-token="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["token"])" asp-route-email="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["email"])" method="post" autocomplete="off">
             <div asp-validation-summary="All" class="message-error"></div>
             <div class="form-fields">
                 <div class="inputs">
diff --git a/src/Web/Grand.Web/Views/Account/Register.cshtml b/src/Web/Grand.Web/Views/Account/Register.cshtml
index cef8bf2a1..28b8bdd28 100644
--- a/src/Web/Grand.Web/Views/Account/Register.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Register.cshtml
@@ -65,7 +65,7 @@
 </script>
 
 <validation-observer v-slot="{ handleSubmit }">
-<form asp-route="Register" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
+<form asp-route="Register" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
 <div class="page registration-page">
 <div asp-validation-summary="All" class="message-error"></div>
 <div class="card my-3">
diff --git a/src/Web/Grand.Web/Views/Account/TwoFactorAuthorization.cshtml b/src/Web/Grand.Web/Views/Account/TwoFactorAuthorization.cshtml
index 88454b94f..cb2602d3a 100644
--- a/src/Web/Grand.Web/Views/Account/TwoFactorAuthorization.cshtml
+++ b/src/Web/Grand.Web/Views/Account/TwoFactorAuthorization.cshtml
@@ -12,7 +12,7 @@
             @* login main block *@
             <div class="col-sm-8 col-12">
                 <div class="card p-3">
-                    <form asp-route="TwoFactorAuthorization" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post">
+                    <form asp-route="TwoFactorAuthorization" asp-route-returnurl="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ReturnUrl"])" method="post">
                         <div class="row">
                             <div asp-validation-summary="All" class="col-12 justify-content-around text-danger"></div>
                             <div class="col-12 form-group mb-0 d-flex justify-content-around">