diff --git a/src/pages/Announcement/Search/SearchForm.js b/src/pages/Announcement/Search/SearchForm.js
index dd4b06d..63d5999 100644
--- a/src/pages/Announcement/Search/SearchForm.js
+++ b/src/pages/Announcement/Search/SearchForm.js
@@ -11,28 +11,109 @@ import * as DateUtils from "utils/DateUtils";
 import {ThemeProvider} from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
+import { makeStyles } from '@mui/styles';
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
-
+const useStyles = makeStyles(() => ({
+    root: {
+      position: "relative"
+    },
+    display: {
+      position: "absolute",
+      top: 2,
+      left: 12,
+      bottom: 2,
+      background: "white",
+      pointerEvents: "none",
+      right: 50,
+      display: "flex",
+      alignItems: "center"
+    },
+  }));
 
 const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
     const navigate = useNavigate()
 
     const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
     const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
+    
+    const [fromDateValue, setFromDateValue] = React.useState("dd / mm / yyyy");
+    const [toDateValue, setToDateValue] = React.useState("dd / mm / yyyy");
+
+    React.useEffect(() => {
+        // console.log(minDate)
+        setFromDateValue(minDate);
+    }, [minDate]);
+    
+    React.useEffect(() => {
+        setToDateValue(maxDate);
+    }, [maxDate]);
+    
+    function FormDateInputComponent({inputRef, ...props }) {
+        const classes = useStyles();
+        return (
+            <>
+            <div className={classes.display}>
+                {DateUtils.dateStr(fromDateValue)=="Invalid Date"?
+                    fromDateValue
+                :
+                    DateUtils.dateStr(fromDateValue)}
+            </div>
+            <input
+                // className={classes.input}
+                ref={inputRef}
+                {...props}
+                // onChange={handleChange}
+                value={fromDateValue}
+                max= {maxDate}
+            />
+            </>
+        );
+    }
+
+    function ToDateInputComponent({inputRef, ...props }) {
+        const classes = useStyles();
+        return (
+            <>
+            <div className={classes.display}>
+                {DateUtils.dateStr(toDateValue)=="Invalid Date"?
+                    toDateValue
+                :
+                    DateUtils.dateStr(toDateValue)}
+            </div>
+            <input
+                // className={classes.input}
+                ref={inputRef}
+                {...props}
+                // onChange={handleChange}
+                value={toDateValue}
+                min = {minDate}
+            />
+            </>
+        );
+    }
 
     const marginBottom = 2.5;
     const { reset, register, handleSubmit } = useForm()
     const onSubmit = (data) => {
+        let sentDateFrom = "";
+        let sentDateTo = "";
+        if( fromDateValue!="dd / mm / yyyy"&&toDateValue!="dd / mm / yyyy"){
+            sentDateFrom = DateUtils.dateValue(fromDateValue)
+            sentDateTo = DateUtils.dateValue(toDateValue)
+        }
+
         const temp = {
             key: data.key,
-            dateFrom: data.dateFrom,
-            dateTo: data.dateTo,
+            dateFrom: sentDateFrom,
+            dateTo: sentDateTo,
         };
         applySearch(temp);
     };
 
 
     function resetForm() {
+        setMinDate(DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)))
+        setMaxDate(DateUtils.dateValue(new Date()))
         reset();
     }
 
@@ -54,7 +135,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
                     </Grid>
                     {/*row 2*/}
                     <Grid container display="flex" alignItems={"center"}>
-                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: marginBottom }}>
+                        <Grid item xs={12} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: marginBottom }}>
                             <TextField
                                 fullWidth
                                 {...register("key")}
@@ -67,7 +148,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
                             />
                         </Grid>
 
-                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
+                        <Grid item xs={12} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:marginBottom}}>
                             <Grid container spacing={1}>
                                 <Grid item xs={6}>
                                     <TextField
@@ -77,14 +158,18 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
                                         type="date"
                                         label={"Submit Date (From)"}
                                         defaultValue={searchCriteria.dateFrom}
-                                        InputProps={{ inputProps: { max: maxDate } }}
+                                        InputProps={{
+                                            inputComponent: FormDateInputComponent,
+                                        }}
                                         onChange={(newValue) => {
-                                            setMinDate(DateUtils.dateValue(newValue));
+                                            if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                         }}
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
 
@@ -95,15 +180,19 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
                                             shrink: true
                                         }}
                                         {...register("dateTo")}
-                                        InputProps={{ inputProps: { min: minDate } }}
+                                        InputProps={{
+                                            inputComponent: ToDateInputComponent,
+                                        }}
                                         onChange={(newValue) => {
-                                            setMaxDate(DateUtils.dateValue(newValue));
+                                            if(newValue.target.value!=""){
+                                                setMaxDate(newValue.target.value);
+                                            }
                                         }}
                                         id="dateTo"
                                         type="date"
                                         label={"Submit Date (To)"}
                                         defaultValue={searchCriteria.dateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
diff --git a/src/pages/Announcement/Search_Public/SearchForm.js b/src/pages/Announcement/Search_Public/SearchForm.js
index 2ad4fc5..56683ed 100644
--- a/src/pages/Announcement/Search_Public/SearchForm.js
+++ b/src/pages/Announcement/Search_Public/SearchForm.js
@@ -12,30 +12,110 @@ import { ThemeProvider } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import { PNSPS_BUTTON_THEME } from "../../../themes/buttonConst";
 import { FormattedMessage, useIntl } from "react-intl";
+import { makeStyles } from '@mui/styles';
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
-
+const useStyles = makeStyles(() => ({
+    root: {
+      position: "relative"
+    },
+    display: {
+      position: "absolute",
+      top: 2,
+      left: 12,
+      bottom: 2,
+      background: "white",
+      pointerEvents: "none",
+      right: 50,
+      display: "flex",
+      alignItems: "center"
+    },
+  }));
 
 const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
     const navigate = useNavigate()
 
     const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
     const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
+    
+    const [fromDateValue, setFromDateValue] = React.useState("dd / mm / yyyy");
+    const [toDateValue, setToDateValue] = React.useState("dd / mm / yyyy");
 
     const intl = useIntl();
 
+    React.useEffect(() => {
+        // console.log(minDate)
+        setFromDateValue(minDate);
+    }, [minDate]);
+    
+    React.useEffect(() => {
+        setToDateValue(maxDate);
+    }, [maxDate]);
+    
+    function FormDateInputComponent({inputRef, ...props }) {
+        const classes = useStyles();
+        return (
+            <>
+            <div className={classes.display}>
+                {DateUtils.dateStr(fromDateValue)=="Invalid Date"?
+                    fromDateValue
+                :
+                    DateUtils.dateStr(fromDateValue)}
+            </div>
+            <input
+                // className={classes.input}
+                ref={inputRef}
+                {...props}
+                // onChange={handleChange}
+                value={fromDateValue}
+                max= {maxDate}
+            />
+            </>
+        );
+    }
+
+    function ToDateInputComponent({inputRef, ...props }) {
+        const classes = useStyles();
+        return (
+            <>
+            <div className={classes.display}>
+                {DateUtils.dateStr(toDateValue)=="Invalid Date"?
+                    toDateValue
+                :
+                    DateUtils.dateStr(toDateValue)}
+            </div>
+            <input
+                // className={classes.input}
+                ref={inputRef}
+                {...props}
+                // onChange={handleChange}
+                value={toDateValue}
+                min = {minDate}
+            />
+            </>
+        );
+    }
+
     const marginBottom = 2.5;
     const { reset, register, handleSubmit } = useForm()
     const onSubmit = (data) => {
+        let sentDateFrom = "";
+        let sentDateTo = "";
+        if( fromDateValue!="dd / mm / yyyy"&&toDateValue!="dd / mm / yyyy"){
+            sentDateFrom = DateUtils.dateValue(fromDateValue)!="Invalid Date"?DateUtils.dateValue(fromDateValue):""
+            sentDateTo = DateUtils.dateValue(toDateValue)!="Invalid Date"?DateUtils.dateValue(toDateValue):""
+        }
         const temp = {
             key: data.key,
-            dateFrom: data.dateFrom,
-            dateTo: data.dateTo,
+            dateFrom: sentDateFrom,
+            dateTo: sentDateTo,
         };
         applySearch(temp);
     };
 
 
     function resetForm() {
+        setMinDate(DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)))
+        setMaxDate(DateUtils.dateValue(new Date()))
         reset();
     }
 
@@ -80,13 +160,18 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                         type="date"
                                         label={intl.formatMessage({ id: 'dateFrom' }) + ":"}
                                         defaultValue={searchCriteria.dateFrom}
-                                        InputProps={{ inputProps: { max: maxDate } }}
+                                        InputProps={{
+                                            inputComponent: FormDateInputComponent,
+                                        }}
                                         onChange={(newValue) => {
-                                            setMinDate(DateUtils.dateValue(newValue));
+                                            if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                         }}
                                         InputLabelProps={{
                                             shrink: true
                                         }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
 
@@ -101,14 +186,19 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                             shrink: true
                                         }}
                                         {...register("dateTo")}
-                                        InputProps={{ inputProps: { min: minDate } }}
+                                        InputProps={{
+                                            inputComponent: ToDateInputComponent,
+                                        }}
                                         onChange={(newValue) => {
-                                            setMaxDate(DateUtils.dateValue(newValue));
+                                            if(newValue.target.value!=""){
+                                                setMaxDate(newValue.target.value);
+                                            }
                                         }}
                                         id="dateTo"
                                         type="date"
                                         //label={"Submit Date(To)"}
                                         defaultValue={searchCriteria.dateTo}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
diff --git a/src/pages/AuditLog/AuditLogSearchForm.js b/src/pages/AuditLog/AuditLogSearchForm.js
index 23c1a8e..592a0cb 100644
--- a/src/pages/AuditLog/AuditLogSearchForm.js
+++ b/src/pages/AuditLog/AuditLogSearchForm.js
@@ -189,12 +189,14 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria}) => {
                                         inputComponent: FormDateInputComponent,
                                     }}
                                     onChange={(newValue) => {
-                                        setMinDate(newValue.target.value);
+                                        if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                     }}
                                     InputLabelProps={{
                                         shrink: true
                                     }}
-                                    sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                    sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                 />
                             </Grid>
 
@@ -213,13 +215,15 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria}) => {
                                         inputComponent: ToDateInputComponent,
                                     }}
                                     onChange={(newValue) => {
-                                        setMaxDate(newValue.target.value);
+                                        if(newValue.target.value!=""){
+                                            setMaxDate(newValue.target.value);
+                                        }
                                     }}
                                     id="modifiedTo"
                                     type="date"
                                     label="Modified To"
                                     defaultValue={searchCriteria.modifiedTo}
-                                    sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                    sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                 />
                             </Grid>
                         </Grid>
diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js
index 98231da..117bd58 100644
--- a/src/pages/DemandNote/Search/SearchForm.js
+++ b/src/pages/DemandNote/Search/SearchForm.js
@@ -361,12 +361,14 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                             inputComponent: FormDateInputComponent,
                                         }}
                                         onChange={(newValue) => {
-                                            setMinDate(newValue.target.value);
+                                            if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                         }}
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
 
@@ -381,13 +383,15 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                             inputComponent: ToDateInputComponent,
                                         }}
                                         onChange={(newValue) => {
-                                            setMaxDate(newValue.target.value);
+                                            if(newValue.target.value!=""){
+                                                setMaxDate(newValue.target.value);
+                                            }
                                         }}
                                         id="dateTo"
                                         type="date"
                                         label={"Issue Date (To)"}
                                         defaultValue={searchCriteria.dateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
@@ -412,7 +416,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
 
@@ -434,7 +438,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                                         type="date"
                                         label={"Due Date (To)"}
                                         defaultValue={searchCriteria.dueDateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js
index ba3530e..8e4f816 100644
--- a/src/pages/DemandNote/Search_Public/SearchForm.js
+++ b/src/pages/DemandNote/Search_Public/SearchForm.js
@@ -256,7 +256,9 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
                                     inputComponent: FormDateInputComponent,
                                 }}
                                 onChange={(newValue) => {
-                                    setMinDate(newValue.target.value);
+                                    if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                 }}
                                 InputLabelProps={{
                                     shrink: true
@@ -275,7 +277,9 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
                                     inputComponent: ToDateInputComponent,
                                 }}
                                 onChange={(newValue) => {
-                                    setMaxDate(newValue.target.value);
+                                    if(newValue.target.value!=""){
+                                        setMaxDate(newValue.target.value);
+                                    }
                                 }}
                                 id="dateTo"
                                 type="date"
diff --git a/src/pages/GFMIS/SearchForm.js b/src/pages/GFMIS/SearchForm.js
index 15c0b9c..dd72e03 100644
--- a/src/pages/GFMIS/SearchForm.js
+++ b/src/pages/GFMIS/SearchForm.js
@@ -134,12 +134,14 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) =>
                                 inputComponent: FormDateInputComponent,
                             }}
                             onChange={(newValue) => {
-                                setMinDate(newValue.target.value);
+                                if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                             }}
                             InputLabelProps={{
                                 shrink: true
                             }}
-                            sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                            sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                         />
                     </Grid>
 
diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js
index 71e9e4f..71e0bb7 100644
--- a/src/pages/Organization/DetailPage/OrganizationCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationCard.js
@@ -440,7 +440,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                             shrink: true
                                         }}
                                         disabled={(!editMode && !createMode)}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js
index eadd7b6..46f23c3 100644
--- a/src/pages/Payment/Search_GLD/SearchForm.js
+++ b/src/pages/Payment/Search_GLD/SearchForm.js
@@ -167,12 +167,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                             inputComponent: FormDateInputComponent,
                                         }}
                                         onChange={(newValue) => {
-                                            setMinDate(newValue.target.value);
+                                            if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                         }}
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                                 <Grid item xs={6}>
@@ -186,13 +188,15 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                             inputComponent: ToDateInputComponent,
                                         }}
                                         onChange={(newValue) => {
-                                            setMaxDate(newValue.target.value);
+                                            if(newValue.target.value!=""){
+                                                setMaxDate(newValue.target.value);
+                                            }
                                         }}
                                         id="dateTo"
                                         type="date"
                                         label="Transaction Date (To)"
                                         defaultValue={searchCriteria.dateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
diff --git a/src/pages/Payment/Search_Public/SearchForm.js b/src/pages/Payment/Search_Public/SearchForm.js
index de493e2..1e4f298 100644
--- a/src/pages/Payment/Search_Public/SearchForm.js
+++ b/src/pages/Payment/Search_Public/SearchForm.js
@@ -184,12 +184,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                         inputComponent: FormDateInputComponent,
                                     }}
                                     onChange={(newValue) => {
-                                        setMinDate(newValue.target.value);
+                                        if(newValue.target.value!=""){
+                                            setMinDate(newValue.target.value);
+                                        }
                                     }}
                                     InputLabelProps={{
                                         shrink: true
                                     }}
-                                    sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                    sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                 />
                             </Grid>
 
@@ -204,13 +206,15 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                         inputComponent: ToDateInputComponent,
                                     }}
                                     onChange={(newValue) => {
-                                        setMaxDate(newValue.target.value);
+                                        if(newValue.target.value!=""){
+                                            setMaxDate(newValue.target.value);
+                                        }
                                     }}
                                     id="dateTo"
                                     type="date"
                                     label={intl.formatMessage({id: 'payDateTo'})}
                                     defaultValue={searchCriteria.dateTo}
-                                    sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                    sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                 />
                             </Grid>
                         </Grid>
diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js
index ba73815..7f30a90 100644
--- a/src/pages/Proof/Search_GLD/SearchForm.js
+++ b/src/pages/Proof/Search_GLD/SearchForm.js
@@ -292,12 +292,14 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                             inputComponent: FormDateInputComponent,
                                         }}
                                         onChange={(newValue) => {
-                                            setMinDate(newValue.target.value);
+                                            if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                         }}
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                                
@@ -312,13 +314,15 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                             inputComponent: ToDateInputComponent,
                                         }}
                                         onChange={(newValue) => {
-                                            setMaxDate(newValue.target.value);
+                                            if(newValue.target.value!=""){
+                                                setMaxDate(newValue.target.value);
+                                            }
                                         }}
                                         id="dateTo"
                                         type="date"
                                         label="Proof Issue Date (To)"
                                         defaultValue={searchCriteria.dateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />    
                                 </Grid>
                             </Grid>
diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js
index d9b51b1..1e25c6e 100644
--- a/src/pages/Proof/Search_Public/SearchForm.js
+++ b/src/pages/Proof/Search_Public/SearchForm.js
@@ -292,12 +292,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                                         inputComponent: FormDateInputComponent,
                                     }}
                                     onChange={(newValue) => {
-                                        setMinDate(newValue.target.value);
+                                        if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                     }}
                                     InputLabelProps={{
                                         shrink: true
                                     }}
-                                    sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                    sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                 />
                             </Grid>
 
@@ -312,13 +314,15 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                                         inputComponent: ToDateInputComponent,
                                     }}
                                     onChange={(newValue) => {
-                                        setMaxDate(newValue.target.value);
+                                        if(newValue.target.value!=""){
+                                            setMaxDate(newValue.target.value);
+                                        }
                                     }}
                                     id="dateTo"
                                     type="date"
                                     label={intl.formatMessage({id: 'proofDateTo'})}
                                     defaultValue={searchCriteria.dateTo}
-                                    sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                    sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                 />
                             </Grid>
                         </Grid>
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
index 91ac214..2543195 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
@@ -179,12 +179,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                 inputComponent: FormDateInputComponent,
                             }}
                             onChange={(newValue) => {
-                                setMinDate(newValue.target.value);
+                                if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                             }}
                             InputLabelProps={{
                                 shrink: true
                             }}
-                            sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                            sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                         />
                     </Grid>
 
@@ -205,9 +207,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                 inputComponent: ToDateInputComponent,
                             }}
                             onChange={(newValue) => {
-                                setMaxDate(newValue.target.value);
+                                if(newValue.target.value!=""){
+                                    setMaxDate(newValue.target.value);
+                                }
                             }}
-                            sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                            sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                         />
                     </Grid>
                     {isORGLoggedIn()?
diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js
index b0a470b..28556bb 100644
--- a/src/pages/PublicNotice/Search_GLD/SearchForm.js
+++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js
@@ -227,12 +227,14 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                             inputComponent: FormDateInputComponent,
                                         }}
                                         onChange={(newValue) => {
-                                            setMinDate(newValue.target.value);
+                                            if(newValue.target.value!=""){
+                                                setMinDate(newValue.target.value);
+                                            }
                                         }}
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                                 
@@ -247,13 +249,15 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                             inputComponent: ToDateInputComponent,
                                         }}
                                         onChange={(newValue) => {
-                                            setMaxDate(newValue.target.value);
+                                            if(newValue.target.value!=""){
+                                                setMaxDate(newValue.target.value);
+                                            }
                                         }}
                                         id="dateTo"
                                         type="date"
                                         label={"Submit Date (To)"}
                                         defaultValue={searchCriteria.dateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
diff --git a/src/pages/Recon/SearchForm.js b/src/pages/Recon/SearchForm.js
index ff211d8..6dbdde6 100644
--- a/src/pages/Recon/SearchForm.js
+++ b/src/pages/Recon/SearchForm.js
@@ -382,7 +382,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                                 <Grid item xs={4}>
@@ -402,7 +402,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
                                         type="date"
                                         label="PNSPS Transaction Date (To)"
                                         ////defaultValue={searchCriteria.dateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
@@ -430,7 +430,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                                 <Grid item xs={4}>
@@ -450,7 +450,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
                                         type="date"
                                         label="FI Transaction Date (To)"
                                         //defaultValue={searchCriteria.dateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>
@@ -478,7 +478,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
                                         InputLabelProps={{
                                             shrink: true
                                         }}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                                 <Grid item xs={4}>
@@ -498,7 +498,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
                                         type="date"
                                         label="Bank Credit Date (To)"
                                         //defaultValue={searchCriteria.dateTo}
-                                        sx={{ "& .MuiInputBase-input": {display:"block"} }}
+                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
                                     />
                                 </Grid>
                             </Grid>