diff --git a/src/components/ReportSearchBox/SearchBox.tsx b/src/components/ReportSearchBox/SearchBox.tsx
index 6ca34f1..c629ad4 100644
--- a/src/components/ReportSearchBox/SearchBox.tsx
+++ b/src/components/ReportSearchBox/SearchBox.tsx
@@ -253,6 +253,7 @@ function SearchBox<T extends string>({
                         <DatePicker
                           label={c.label}
                           onChange={makeDateChangeHandler(c.paramName)}
+                          value={inputs[c.paramName] ? dayjs(inputs[c.paramName]) : null}
                         />
                       </FormControl>
                       <Box
@@ -267,6 +268,7 @@ function SearchBox<T extends string>({
                         <DatePicker
                           label={c.label2}
                           onChange={makeDateToChangeHandler(c.paramName)}
+                          value={inputs[c.paramName.concat("To") as T] ? dayjs(inputs[c.paramName.concat("To") as T]) : null}
                         />
                       </FormControl>
                     </Box>
@@ -287,9 +289,9 @@ function SearchBox<T extends string>({
             <Button
               variant="outlined"
               startIcon={<Search />}
-              onClick={handleDownload}
+              onClick={handleSearch}
             >
-              {t("Download Report")}
+              {t("Search")}
             </Button>
           </CardActions>
       </CardContent>
diff --git a/src/components/ReportSearchBox2/SearchBox2.tsx b/src/components/ReportSearchBox2/SearchBox2.tsx
index 16b72df..37d65ba 100644
--- a/src/components/ReportSearchBox2/SearchBox2.tsx
+++ b/src/components/ReportSearchBox2/SearchBox2.tsx
@@ -253,6 +253,7 @@ function SearchBox<T extends string>({
                         <DatePicker
                           label={c.label}
                           onChange={makeDateChangeHandler(c.paramName)}
+                          value={inputs[c.paramName] ? dayjs(inputs[c.paramName]) : null}
                         />
                       </FormControl>
                       <Box
@@ -267,6 +268,7 @@ function SearchBox<T extends string>({
                         <DatePicker
                           label={c.label2}
                           onChange={makeDateToChangeHandler(c.paramName)}
+                          value={inputs[c.paramName.concat("To") as T] ? dayjs(inputs[c.paramName.concat("To") as T]) : null}
                         />
                       </FormControl>
                     </Box>
@@ -287,9 +289,9 @@ function SearchBox<T extends string>({
             <Button
               variant="outlined"
               startIcon={<Search />}
-              onClick={handleDownload}
+              onClick={handleSearch}
             >
-              {t("Download Report")}
+              {t("Search")}
             </Button>
           </CardActions>
       </CardContent>
diff --git a/src/components/ReportSearchBox3/SearchBox3.tsx b/src/components/ReportSearchBox3/SearchBox3.tsx
index b01032b..8bf2fea 100644
--- a/src/components/ReportSearchBox3/SearchBox3.tsx
+++ b/src/components/ReportSearchBox3/SearchBox3.tsx
@@ -253,6 +253,7 @@ function SearchBox<T extends string>({
                         <DatePicker
                           label={c.label}
                           onChange={makeDateChangeHandler(c.paramName)}
+                          value={inputs[c.paramName] ? dayjs(inputs[c.paramName]) : null}
                         />
                       </FormControl>
                       <Box
@@ -267,6 +268,7 @@ function SearchBox<T extends string>({
                         <DatePicker
                           label={c.label2}
                           onChange={makeDateToChangeHandler(c.paramName)}
+                          value={inputs[c.paramName.concat("To") as T] ? dayjs(inputs[c.paramName.concat("To") as T]) : null}
                         />
                       </FormControl>
                     </Box>
@@ -287,9 +289,9 @@ function SearchBox<T extends string>({
             <Button
               variant="outlined"
               startIcon={<Search />}
-              onClick={handleDownload}
+              onClick={handleSearch}
             >
-              {t("Download Report")}
+              {t("Search")}
             </Button>
           </CardActions>
       </CardContent>