diff --git a/src/app/Http/Controllers/RainfallController.php b/src/app/Http/Controllers/RainfallController.php
index 8e79a80f..ff3b6ac4 100644
--- a/src/app/Http/Controllers/RainfallController.php
+++ b/src/app/Http/Controllers/RainfallController.php
@@ -301,9 +301,15 @@ class RainfallController extends Controller
     // Function for Retrieve Historical Rainfall Data
    public function historicalRainfall(Request $request)
     {
-        $stationFilter = $request->get('station');
-        $startDateInput = $request->input('startdate');
-        $endDateInput = $request->input('enddate');
+        $validated = $request->validate([
+            'station' => 'required|string|max:20',
+            'startdate' => 'required|date',
+            'enddate' => 'required|date|after_or_equal:startdate',
+        ]);
+
+        $stationFilter = $validated['station'];
+        $startDateInput = $validated['startdate'];
+        $endDateInput = $validated['enddate'];
 
         $displayDate = $startDateInput ?: now();
         $displayEndDate = $endDateInput ?: now();
@@ -368,9 +374,15 @@ class RainfallController extends Controller
     // Function for export Historical Rainfall To Excel File
     public function exportHourlyRainfallExcel(Request $request)
     {
-        $stationid = $request->get('station');
-        $startDate = $request->input('startdate');
-        $endDate = $request->input('enddate');
+        $validated = $request->validate([
+            'station' => 'required|string|max:20',
+            'startdate' => 'required|date',
+            'enddate' => 'required|date|after_or_equal:startdate',
+        ]);
+
+        $stationid = $validated['station'];
+        $startDate = $validated['startdate'];
+        $endDate = $validated['enddate'];
 
         
         $startDate2 = Carbon::parse($startDate)->toDateString();
diff --git a/src/app/Http/Controllers/WaterLevelController.php b/src/app/Http/Controllers/WaterLevelController.php
index 1e03f75c..e1820c35 100644
--- a/src/app/Http/Controllers/WaterLevelController.php
+++ b/src/app/Http/Controllers/WaterLevelController.php
@@ -80,8 +80,13 @@ class WaterLevelController extends Controller
     // Function Retrieve Water Level Historical Data
     public function wlHistory(Request $request)
     {
-        $stationid = $request->get('station');
-        $startDate = $request->input('startdate');
+        $validated = $request->validate([
+            'station' => 'required|string|max:20',
+            'startdate' => 'required|date',
+        ]);
+
+        $stationid = $validated['station'];
+        $startDate = $validated['startdate'];
  
 
         $stations = DB::table('station')->select('stationid','name')
@@ -122,8 +127,13 @@ class WaterLevelController extends Controller
     // Function export historical water level data 
     public function exportHistoricalWl(Request $request)
     {
-        $stationid = $request->get('station');
-        $startDate = $request->input('startdate');
+        $validated = $request->validate([
+            'station' => 'required|string|max:20',
+            'startdate' => 'required|date',
+        ]);
+
+        $stationid = $validated['station'];
+        $startDate = $validated['startdate'];
 
         $startDate2 = Carbon::parse($startDate)->toDateString();