diff --git a/src/entities/additional-service/model/key-in/constant.ts b/src/entities/additional-service/model/key-in/constant.ts
index b37abbc..c0a555b 100644
--- a/src/entities/additional-service/model/key-in/constant.ts
+++ b/src/entities/additional-service/model/key-in/constant.ts
@@ -5,7 +5,9 @@ export const getKeyInPaymentPaymentStatusBtnGroup = (t: TFunction) => [
   { name: t('transaction.constants.all'), value: KeyInPaymentTansactionType.ALL },
   { name: t('transaction.constants.approval'), value: KeyInPaymentTansactionType.APPROVAL },
   { name: t('additionalService.keyIn.fullCancel'), value: KeyInPaymentTansactionType.FULL_CANCEL },
-  { name: t('additionalService.keyIn.partialCancel'), value: KeyInPaymentTansactionType.PARTIAL_CANCEL }
+  { name: t('additionalService.keyIn.partialCancel'), value: KeyInPaymentTansactionType.PARTIAL_CANCEL },
+  { name: t('additionalService.keyIn.preCancel'), value: KeyInPaymentTansactionType.PRE_CANCEL },
+  { name: t('additionalService.keyIn.postCancel'), value: KeyInPaymentTansactionType.POST_CANCEL }
 ];
 
 export const getKeyInPaymentPaymentStatusName = (t: TFunction) => (status?: string): string => {
diff --git a/src/entities/additional-service/model/key-in/types.ts b/src/entities/additional-service/model/key-in/types.ts
index 1b1e144..72932a9 100644
--- a/src/entities/additional-service/model/key-in/types.ts
+++ b/src/entities/additional-service/model/key-in/types.ts
@@ -8,7 +8,9 @@ export enum KeyInPaymentTansactionType {
   ALL = 'ALL',
   APPROVAL = 'APPROVAL',
   FULL_CANCEL = 'FULL_CANCEL',
-  PARTIAL_CANCEL = 'PARTIAL_CANCEL'
+  PARTIAL_CANCEL = 'PARTIAL_CANCEL',
+  PRE_CANCEL = 'PRE_CANCEL',
+  POST_CANCEL = 'POST_CANCEL'
 }
 
 export enum KeyInPaymentStatus {
diff --git a/src/locales/en.json b/src/locales/en.json
index c3bbeb0..818d77e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -191,7 +191,7 @@
             }
         },
         "faq": {
-            "title": "Frequently Asked Questions",
+            "title": "FAQ",
             "searchPlaceholder": "Enter search keyword",
             "all": "All",
             "inquiryButton": "Contact Support",
@@ -219,13 +219,13 @@
             "categories": {
                 "all": "All",
                 "choose": "Choose",
-                "01": "Billing & Tax Inquiry",
-                "02": "Transaction & Cancellation Inquiry",
-                "03": "Contract & Service Request Inquiry",
-                "04": "Technical & Payment Error Inquiry",
+                "01": "Billing & Tax",
+                "02": "Transaction & Cancellation",
+                "03": "Contract & Service Request",
+                "04": "Technical & Payment Error",
                 "05": "Others",
-                "06": "Service Usage Inquiry",
-                "09": "Credit Limit & Insurance Inquiry"
+                "06": "Service Usage",
+                "09": "Credit Limit & Insurance"
             },
             "statusCode": {
                 "all": "All",
@@ -830,7 +830,7 @@
             "faceAuthDesc": "Secure payment service with face recognition for easy identity verification"
         },
         "settlementAgency": {
-            "title": "Settlement Agency",
+            "title": "Settlement Service",
             "depositConfirmation": "Deposit Confirmation",
             "settlementInfo": "Settlement Information",
             "settlementId": "Settlement ID",
@@ -1042,6 +1042,8 @@
         "keyIn": {
             "fullCancel": "Full Cancel",
             "partialCancel": "Partial Cancel",
+            "preCancel": "Pre-cancel",
+            "postCancel": "Post-cancel",
             "productPrice": "Product Price"
         },
         "infoWrap": {
diff --git a/src/shared/ui/filter/calendar-month.tsx b/src/shared/ui/filter/calendar-month.tsx
index 160df35..10645b9 100644
--- a/src/shared/ui/filter/calendar-month.tsx
+++ b/src/shared/ui/filter/calendar-month.tsx
@@ -67,11 +67,15 @@ export const FilterCalendarMonth = ({
 
   const setNewMonth = (month: string) => {
     console.log(month)
-    if(calendarType === CalendarType.Start){
-      setStartMonth(moment(month+'.01').format('YYYYMM'));
-    }
-    else if(calendarType === CalendarType.End){
-      setEndMonth(moment(month+'.01').format('YYYYMM'));
+    // month is already in 'YYYY.MM' format from NiceCalendarMonth
+    const parsedMonth = moment(month, 'YYYY.MM', true);
+    if (parsedMonth.isValid()) {
+      if(calendarType === CalendarType.Start){
+        setStartMonth(parsedMonth.format('YYYYMM'));
+      }
+      else if(calendarType === CalendarType.End){
+        setEndMonth(parsedMonth.format('YYYYMM'));
+      }
     }
     setCalendarOpen(false);
   }