diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js
index 1871c379db..0f619a2e4d 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js
@@ -3,17 +3,6 @@
 
     var commentsService = volo.cmsKit.admin.comments.commentAdmin;
 
-    moment()._locale.preparse = (string) => string;
-    moment()._locale.postformat = (string) => string;
-
-    var getFormattedDate = function ($datePicker) {
-        if (!$datePicker.val()) {
-            return null;
-        }
-        var momentDate = moment($datePicker.val(), $datePicker.data('daterangepicker').locale.format);
-        return momentDate.isValid() ? momentDate.toISOString() : null;
-    };
-
     var singleDatePicker = $('#CmsKitCommentsApproveWrapper .singledatepicker');
     singleDatePicker.daterangepicker({
         "singleDatePicker": true,
@@ -33,13 +22,10 @@
     var filterForm = $('#CmsKitCommentsFilterForm');
 
     var getFilter = function () {
-        var filterObj = filterForm.serializeFormToObject();
-
-        filterObj.creationStartDate = getFormattedDate($('#CreationStartDate'));
-        filterObj.creationEndDate = getFormattedDate($('#CreationEndDate'));
-        filterObj.commentApproveState = "Waiting";
-
-        return filterObj;
+        filterForm.handleDatepicker('.singledatepicker');
+        var formObject = filterForm.serializeFormToObject();
+        formObject.commentApproveState = "Waiting";
+        return formObject;
     };
 
     var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({
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 d0e83a0b9d..59bce547de 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
@@ -8,13 +8,6 @@ $(function (){
     if (commentRequireApprovement) {
         $('#IsApprovedSelectInput').show();
     }
-    
-    var getFormattedDate = function ($datePicker) {
-        return $datePicker.data('date');
-    };
-
-	moment.localeData().preparse = (s)=>s;
-    moment.localeData().postformat = (s)=>s;
 	
     var singleDatePicker = $('#CmsKitCommentsDetailsWrapper .singledatepicker');
     singleDatePicker.daterangepicker({
@@ -38,12 +31,9 @@ $(function (){
     var filterForm = $('#CmsKitCommentsFilterForm');
 
     var getFilter = function () {
-        var filterObj = filterForm.serializeFormToObject();
-
-        filterObj.creationStartDate = getFormattedDate($('#creationStartDate'));
-        filterObj.creationEndDate = getFormattedDate($('#creationEndDate'));
-        
-        return filterObj;
+        filterForm.handleDatepicker('.singledatepicker');
+        var formObject = filterForm.serializeFormToObject();
+        return formObject;
     };
     
     var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({
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 a68f229f4e..e1c2902a01 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
@@ -3,9 +3,6 @@ $(function () {
 
     var commentsService = volo.cmsKit.admin.comments.commentAdmin;
 
-    moment()._locale.preparse = (string) => string;
-    moment()._locale.postformat = (string) => string;
-
     var commentRequireApprovement = abp.setting.getBoolean("CmsKit.Comments.RequireApprovement");
 
     if (commentRequireApprovement) {
@@ -13,14 +10,6 @@ $(function () {
         $('#IsApprovedSelectInput').show();
     }
 
-    var getFormattedDate = function ($datePicker) {
-        if (!$datePicker.val()) {
-            return null;
-        }
-        var momentDate = moment($datePicker.val(), $datePicker.data('daterangepicker').locale.format);
-        return momentDate.isValid() ? momentDate.toISOString() : null;
-    };
-
     var singleDatePicker = $('#CmsKitCommentsWrapper .singledatepicker');
     singleDatePicker.daterangepicker({
         "singleDatePicker": true,
@@ -40,12 +29,9 @@ $(function () {
     var filterForm = $('#CmsKitCommentsFilterForm');
 
     var getFilter = function () {
-        var filterObj = filterForm.serializeFormToObject();
-
-        filterObj.creationStartDate = getFormattedDate($('#CreationStartDate'));
-        filterObj.creationEndDate = getFormattedDate($('#CreationEndDate'));
-
-        return filterObj;
+        filterForm.handleDatepicker('.singledatepicker');
+        var formObject = filterForm.serializeFormToObject();
+        return formObject;
     };
 
     var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
index 0d17f56a45..fb513e5f0f 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
@@ -2,13 +2,6 @@ $(function () {
     var l = abp.localization.getResource('Docs');
     var service = window.volo.docs.admin.documentsAdmin;
 
-    var getFormattedDate = function ($datePicker) {
-        return $datePicker.data('date');
-    };
-
-	moment.localeData().preparse = (s)=>s;
-    moment.localeData().postformat = (s)=>s;
-	
     var singleDatePicker = $('#DocumentsContainer .singledatepicker');
     singleDatePicker.daterangepicker({
         "singleDatePicker": true,
@@ -131,23 +124,26 @@ $(function () {
 
 
     var getFilter = function () {
+        $('#DocumentsContainer').handleDatepicker('.singledatepicker');
+
         return {
             projectId: $('#ProjectId').val(),
             name: $('#Name').val(),
             version: $('#Version').val(),
             languageCode: $('#LanguageCode').val(),
             format: $('#Format').val(),
-            creationTimeMin: getFormattedDate($('#CreationTimeMin')),
-            creationTimeMax: getFormattedDate($('#CreationTimeMax')),
-            lastUpdatedTimeMin: getFormattedDate($('#LastUpdatedTimeMin')),
-            lastUpdatedTimeMax: getFormattedDate($('#LastUpdatedTimeMax')),
-            lastSignificantUpdateTimeMin: getFormattedDate($('#LastSignificantUpdateTimeMin')),
-            lastSignificantUpdateTimeMax: getFormattedDate($('#LastSignificantUpdateTimeMax')),
-            lastCachedTimeMin: getFormattedDate($('#LastCachedTimeMin')),
-            lastCachedTimeMax: getFormattedDate($('#LastCachedTimeMax')),
+            creationTimeMin: $('#DocumentsContainer').find('input[name="CreationTimeMin"'),
+            creationTimeMax: $('#DocumentsContainer').find('input[name="CreationTimeMax"'),
+            lastUpdatedTimeMin: $('#DocumentsContainer').find('input[name="LastUpdatedTimeMin"'),
+            lastUpdatedTimeMax: $('#DocumentsContainer').find('input[name="LastUpdatedTimeMax"'),
+            lastSignificantUpdateTimeMin: $('#DocumentsContainer').find('input[name="LastSignificantUpdateTimeMin"'),
+            lastSignificantUpdateTimeMax: $('#DocumentsContainer').find('input[name="LastSignificantUpdateTimeMax"'),
+            lastCachedTimeMin: $('#DocumentsContainer').find('input[name="LastCachedTimeMin"'),
+            lastCachedTimeMax: $('#DocumentsContainer').find('input[name="LastCachedTimeMax"'),
         };
     };
 
+
     var parseDateToLocaleDateString = function (date) {
         var parsedDate = Date.parse(date);
         return new Date(parsedDate).toLocaleDateString(