diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js
index 94bc08f..002508e 100644
--- a/src/pages/Proof/Search_Public/SearchForm.js
+++ b/src/pages/Proof/Search_Public/SearchForm.js
@@ -87,6 +87,24 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
             //contact: data.contact,
             replyed: (status?.type && status?.type != 'all') ? status?.type : "",
         };
+        if(status?.type && status?.type != 'all'){
+            if (status?.type == "Confirmed"){
+                temp["replyed"] = "T";
+                temp["action"] = true;
+            }else if(status?.type == "Re-proofing"){
+                temp["replyed"] = "T";
+                temp["action"] = false;
+            }else if(status?.type == "No Reply"){
+                temp["replyed"] = "F";
+                temp["timeOut"] = "T";
+            }else if(status?.type == "Cancelled"){
+                temp["cancelled"] = true;
+            }else{
+                temp["replyed"] = "F";
+                temp["timeOut"] = "F";
+            }
+        }
+        
         applySearch(temp);
     };
 
@@ -301,7 +319,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                             size="small"
                             id="status"
                             filterOptions={(options) => options}
-                            options={ComboData.proofStatus}
+                            options={ComboData.proofStatusFull}
                             value={status}
                             getOptionLabel={(option) => option.type? intl.formatMessage({ id: option.i18nLabel }) : ""}
                             inputValue={status? intl.formatMessage({ id: status.i18nLabel }) : ""}
diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js
index ddf2427..cb87f9e 100644
--- a/src/utils/ComboData.js
+++ b/src/utils/ComboData.js
@@ -110,6 +110,15 @@ export const proofStatus = [
     { key: 2, i18nLabel: 'pendingReply', labelCht: '未回覆', label:'Pending Reply', type: 'F' },
 ];
 
+export const proofStatusFull = [
+    { key: 0, i18nLabel: 'all', labelCht: '全部', label: 'All',  type: 'all' },
+    { key: 1, i18nLabel: 'Confirmed', labelCht: '可以付印', label:'Confirmed',  type: 'Confirmed' },
+    { key: 1, i18nLabel: 'Re-proofing', labelCht: '未能付印', label:'Re-proofing',  type: 'Re-proofing' }, // submitted and reviewed
+    { key: 2, i18nLabel: 'No Reply', labelCht: '回覆逾時', label:'No Reply', type: 'No Reply' },
+    { key: 2, i18nLabel: 'Pending Reply', labelCht: '未回覆', label:'Pending Reply', type: 'Pending Reply' },
+    { key: 2, i18nLabel: 'Cancelled', labelCht: '已取消', label:'Cancelled', type: 'Cancelled' },
+];
+
 export const paymentStatus = [
     { key: 0, i18nLabel: 'all', labelCht: '全部', label: 'All',  type: 'all' },
     { key: 1, i18nLabel: 'success', labelCht: '成功', label:'Success',  type: 'APPR' },