diff --git a/src/pages/ProofSearch/SearchForm.js b/src/pages/ProofSearch/SearchForm.js
index 569bc91..1aab6af 100644
--- a/src/pages/ProofSearch/SearchForm.js
+++ b/src/pages/ProofSearch/SearchForm.js
@@ -17,7 +17,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
      }) => {
 
     const [type, setType] = React.useState([]);
-    const [status, setStatus] = React.useState({ key: 0, label: 'All', type: 'all' });
+    const [status, setStatus] = React.useState(ComboData.proofStatus[0]);
     const [orgSelected, setOrgSelected] = React.useState({});
     const [orgCombo, setOrgCombo] = React.useState();
     const [issueSelected, setIssueSelected] = React.useState({});
@@ -66,7 +66,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
 
     function resetForm() {
         setType([]);
-        setStatus({ key: 0, label: 'All', type: 'all' });
+        setStatus(ComboData.proofStatus[0]);
         setOrgSelected({});
         setIssueSelected({});
         setGroupSelected({});
@@ -138,9 +138,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
                             inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""}
                             getOptionLabel={(option)=>getIssueLabel(option)}
                             onChange={(event, newValue) => {
-                                if (newValue !== null) {
-                                    setIssueSelected(newValue);
-                                }
+                                setIssueSelected(newValue);
                             }}
                             renderInput={(params) => (
                                 <TextField {...params}
@@ -163,9 +161,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
                             inputValue={(groupSelected?.label)?groupSelected?.label:""}
                             getOptionLabel={(option)=>option.label}
                             onChange={(event, newValue) => {
-                                if (newValue !== null) {
-                                    setGroupSelected(newValue);
-                                }
+                                setGroupSelected(newValue);
                             }}
                             renderInput={(params) => (
                                 <TextField {...params}
@@ -264,9 +260,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
                                     value={orgSelected}
                                     inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
                                     onChange={(event, newValue) => {
-                                        if (newValue !== null) {
-                                            setOrgSelected(newValue);
-                                        }
+                                        setOrgSelected(newValue);
                                     }}
                                     renderInput={(params) => (
                                         <TextField {...params}