diff --git a/app/Exports/ExportAKIAKB.php b/app/Exports/ExportAKIAKB.php
index 92c9e66cc..6c9e3d63d 100644
--- a/app/Exports/ExportAKIAKB.php
+++ b/app/Exports/ExportAKIAKB.php
@@ -109,7 +109,7 @@ public function map($akiAkb): array
 
         return [
             $akiAkb->id,
-            $akiAkb->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($akiAkb->desa_id) ?? 'Tidak Diketahui',
             $akiAkb->desa_id,
             $akiAkb->aki,
             $akiAkb->akb,
diff --git a/app/Exports/ExportEpidemiPenyakit.php b/app/Exports/ExportEpidemiPenyakit.php
index ed09eeb4d..567decd02 100644
--- a/app/Exports/ExportEpidemiPenyakit.php
+++ b/app/Exports/ExportEpidemiPenyakit.php
@@ -80,7 +80,7 @@ public function map($epidemiPenyakit): array
     {
         return [
             $epidemiPenyakit->id,
-            $epidemiPenyakit->desa->nama ?? '',
+            nama_desa($epidemiPenyakit->desa_id) ?? '',
             $epidemiPenyakit->penyakit->nama ?? '',
             $epidemiPenyakit->jumlah_penderita,
             months_list()[$epidemiPenyakit->bulan] ?? $epidemiPenyakit->bulan,
diff --git a/app/Exports/ExportFasilitasPaud.php b/app/Exports/ExportFasilitasPaud.php
index 859e9e4ab..198e0a431 100644
--- a/app/Exports/ExportFasilitasPaud.php
+++ b/app/Exports/ExportFasilitasPaud.php
@@ -81,7 +81,7 @@ public function map($fasilitasPaud): array
     {
         return [
             $fasilitasPaud->id,
-            $fasilitasPaud->desa->nama ?? '',
+            nama_desa($fasilitasPaud->desa_id) ?? '',
             $fasilitasPaud->jumlah_paud,
             $fasilitasPaud->jumlah_guru_paud,
             $fasilitasPaud->jumlah_siswa_paud,
diff --git a/app/Exports/ExportImunisasi.php b/app/Exports/ExportImunisasi.php
index 7417df3fc..60437ce14 100644
--- a/app/Exports/ExportImunisasi.php
+++ b/app/Exports/ExportImunisasi.php
@@ -82,7 +82,7 @@ public function map($imunisasi): array
 
         return [
             $imunisasi->id,
-            $imunisasi->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($imunisasi->desa_id) ?? 'Tidak Diketahui',
             $imunisasi->desa_id,
             $imunisasi->cakupan_imunisasi, // Format dengan persen
             $bulanList[$imunisasi->bulan] ?? 'Tidak Diketahui',
diff --git a/app/Exports/ExportPutusSekolah.php b/app/Exports/ExportPutusSekolah.php
index df09a7115..a83d7fcf9 100644
--- a/app/Exports/ExportPutusSekolah.php
+++ b/app/Exports/ExportPutusSekolah.php
@@ -86,7 +86,7 @@ public function map($putusSekolah): array
     {
         return [
             $putusSekolah->id,
-            $putusSekolah->desa->nama ?? '',
+            nama_desa($putusSekolah->desa_id) ?? '',
             $putusSekolah->siswa_paud,
             $putusSekolah->anak_usia_paud,
             $putusSekolah->siswa_sd,
diff --git a/app/Exports/ExportTingkatPendidikan.php b/app/Exports/ExportTingkatPendidikan.php
index bd264584b..aa938de29 100644
--- a/app/Exports/ExportTingkatPendidikan.php
+++ b/app/Exports/ExportTingkatPendidikan.php
@@ -83,7 +83,7 @@ public function map($tingkatPendidikan): array
     {
         return [
             $tingkatPendidikan->id,
-            $tingkatPendidikan->desa->nama ?? '',
+            nama_desa($tingkatPendidikan->desa_id) ?? '',
             $tingkatPendidikan->tidak_tamat_sekolah,
             $tingkatPendidikan->tamat_sd,
             $tingkatPendidikan->tamat_smp,
diff --git a/app/Exports/ExportToiletSanitasi.php b/app/Exports/ExportToiletSanitasi.php
index 1122e105b..081e26bdd 100644
--- a/app/Exports/ExportToiletSanitasi.php
+++ b/app/Exports/ExportToiletSanitasi.php
@@ -83,7 +83,7 @@ public function map($toiletSanitasi): array
 
         return [
             $toiletSanitasi->id,
-            $toiletSanitasi->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($toiletSanitasi->desa_id) ?? 'Tidak Diketahui',
             $toiletSanitasi->desa_id,
             $toiletSanitasi->toilet,
             $toiletSanitasi->sanitasi,
diff --git a/app/Http/Controllers/Data/AKIAKBController.php b/app/Http/Controllers/Data/AKIAKBController.php
index 2553c1f00..b7ceecea6 100644
--- a/app/Http/Controllers/Data/AKIAKBController.php
+++ b/app/Http/Controllers/Data/AKIAKBController.php
@@ -34,6 +34,7 @@
 use App\Exports\ExportAKIAKB;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportAKIAKBRequest;
+use App\Http\Requests\UpdateAKIAKBRequest;
 use App\Imports\ImporAKIAKB;
 use App\Models\AkiAkb;
 use App\Services\DesaService;
@@ -65,8 +66,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(AkiAkb::with(['desa'])->get())
+        return DataTables::of(AkiAkb::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.aki_akb.edit') ? route('data.aki-akb.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.aki_akb.delete') ? route('data.aki-akb.destroy', $row->id) : null;
diff --git a/app/Http/Controllers/Data/FasilitasPaudController.php b/app/Http/Controllers/Data/FasilitasPaudController.php
index 03e6122b4..baeaa52bc 100644
--- a/app/Http/Controllers/Data/FasilitasPaudController.php
+++ b/app/Http/Controllers/Data/FasilitasPaudController.php
@@ -34,8 +34,10 @@
 use App\Exports\ExportFasilitasPaud;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportFasilitasPaudRequest;
+use App\Http\Requests\UpdateFasilitasPaudRequest;
 use App\Imports\ImporFasilitasPaud;
 use App\Models\FasilitasPAUD;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -59,12 +61,18 @@ public function index()
      */
     public function getDataFasilitasPAUD()
     {
-        return DataTables::of(FasilitasPAUD::with(['desa'])->get())
+        $desa = request()->input('desa');
+        $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
+        return DataTables::of(FasilitasPAUD::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+                    return $query->where('desa_id', $desa);
+                })->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.fasilitas_paud.edit') ? route('data.fasilitas-paud.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.fasilitas_paud.delete') ? route('data.fasilitas-paud.destroy', $row->id) : null;
 
                 return view('forms.aksi', $data);
+            })->addColumn('nama_desa', function ($row) use ($listDesa) {
+                return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
             })
             ->rawColumns(['aksi'])->make();
     }
@@ -116,7 +124,7 @@ public function edit($id)
     {
         $fasilitas = FasilitasPAUD::with(['desa'])->findOrFail($id);
         $page_title = 'Fasilitas PAUD';
-        $page_description = 'Ubah Fasilitas PAUD : Desa ' . $fasilitas->desa->nama;
+        $page_description = 'Ubah Fasilitas PAUD : Desa ' . nama_desa($fasilitas->desa_id);
 
         return view('data.fasilitas_paud.edit', compact('page_title', 'page_description', 'fasilitas'));
     }
@@ -127,18 +135,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdateFasilitasPaudRequest $request, $id)
     {
-        request()->validate([
-            'jumlaah_paud' => 'required',
-            'jumlah_guru_paud' => 'required',
-            'jumlah_siswa_paud' => 'required',
-            'semester' => 'required',
-            'tahun' => 'required',
-        ]);
-
         try {
-            FasilitasPAUD::findOrFail($id)->update($request->all());
+            FasilitasPAUD::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Fasilitas PAUD update failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Controllers/Data/ImunisasiController.php b/app/Http/Controllers/Data/ImunisasiController.php
index ac5a550cc..fef53f2ec 100644
--- a/app/Http/Controllers/Data/ImunisasiController.php
+++ b/app/Http/Controllers/Data/ImunisasiController.php
@@ -65,8 +65,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(Imunisasi::with(['desa'])->get())
+        return DataTables::of(Imunisasi::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.imunisasi.edit') ? route('data.imunisasi.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.imunisasi.delete') ? route('data.imunisasi.destroy', $row->id) : null;
diff --git a/app/Http/Controllers/Data/PutusSekolahController.php b/app/Http/Controllers/Data/PutusSekolahController.php
index 0273a0061..78d50ba57 100644
--- a/app/Http/Controllers/Data/PutusSekolahController.php
+++ b/app/Http/Controllers/Data/PutusSekolahController.php
@@ -34,8 +34,10 @@
 use App\Exports\ExportPutusSekolah;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportPutusSekolahRequest;
+use App\Http\Requests\UpdatePutusSekolahRequest;
 use App\Imports\ImporPutusSekolah;
 use App\Models\PutusSekolah;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -59,12 +61,18 @@ public function index()
      */
     public function getDataPutusSekolah()
     {
-        return DataTables::of(PutusSekolah::with(['desa'])->get())
-            ->addColumn('aksi', function ($row) {
+        $desa = request()->input('desa');
+        $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
+        return DataTables::of(PutusSekolah::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+                    return $query->where('desa_id', $desa);
+                })->with(['desa'])->get())
+            ->addColumn('aksi', function ($row) {                
                 $data['edit_url'] = auth()->user()->can('access.data.putus_sekolah.edit') ? route('data.putus-sekolah.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.putus_sekolah.delete') ? route('data.putus-sekolah.destroy', $row->id) : null;
 
                 return view('forms.aksi', $data);
+            })->addColumn('nama_desa', function ($row) use ($listDesa) {
+                return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
             })
             ->rawColumns(['aksi'])->make();
     }
@@ -116,7 +124,7 @@ public function edit($id)
     {
         $siswa = PutusSekolah::with(['desa'])->findOrFail($id);
         $page_title = 'Siswa Putus Sekolah';
-        $page_description = 'Ubah Siswa Putus Sekolah : Desa ' . $siswa->desa->nama;
+        $page_description = 'Ubah Siswa Putus Sekolah : Desa ' . nama_desa($siswa->desa_id);
 
         return view('data.putus_sekolah.edit', compact('page_title', 'page_description', 'siswa'));
     }
@@ -127,23 +135,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdatePutusSekolahRequest $request, $id)
     {
-        request()->validate([
-            'siswa_paud' => 'required',
-            'anak_usia_paud' => 'required',
-            'siswa_sd' => 'required',
-            'anak_usia_sd' => 'required',
-            'siswa_smp' => 'required',
-            'anak_usia_smp' => 'required',
-            'siswa_sma' => 'required',
-            'anak_usia_sma' => 'required',
-            'semester' => 'required',
-            'tahun' => 'required',
-        ]);
-
         try {
-            PutusSekolah::findOrFail($id)->update($request->all());
+            PutusSekolah::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Putus Sekolah update failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Controllers/Data/TingkatPendidikanController.php b/app/Http/Controllers/Data/TingkatPendidikanController.php
index 2fdab92d0..8f27d095c 100644
--- a/app/Http/Controllers/Data/TingkatPendidikanController.php
+++ b/app/Http/Controllers/Data/TingkatPendidikanController.php
@@ -36,6 +36,7 @@
 use App\Http\Requests\TingkatPendidikanRequest;
 use App\Imports\ImporTingkatPendidikan;
 use App\Models\TingkatPendidikan;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -61,7 +62,7 @@ public function getData()
     {
         if (request()->ajax()) {
             $desa = request()->input('desa');
-
+            $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
             return DataTables::of(
                 TingkatPendidikan::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
                     return $query->where('desa_id', $desa);
@@ -74,6 +75,9 @@ public function getData()
 
                     return view('forms.aksi', $data);
                 })
+                ->addColumn('nama_desa', function ($row) use ($listDesa) {
+                    return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
+                })
                 ->rawColumns(['aksi'])
                 ->make();
         }
diff --git a/app/Http/Controllers/Data/ToiletSanitasiController.php b/app/Http/Controllers/Data/ToiletSanitasiController.php
index aa60afe6e..227f6eae1 100644
--- a/app/Http/Controllers/Data/ToiletSanitasiController.php
+++ b/app/Http/Controllers/Data/ToiletSanitasiController.php
@@ -34,6 +34,7 @@
 use App\Exports\ExportToiletSanitasi;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportToiletSanitasiRequest;
+use App\Http\Requests\UpdateToiletSanitasiRequest;
 use App\Imports\ImporToiletSanitasi;
 use App\Models\ToiletSanitasi;
 use App\Services\DesaService;
@@ -65,8 +66,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(ToiletSanitasi::with(['desa']))
+        return DataTables::of(ToiletSanitasi::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa']))
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.toilet_sanitasi.edit') ? route('data.toilet-sanitasi.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.toilet_sanitasi.delete') ? route('data.toilet-sanitasi.destroy', $row->id) : null;
@@ -114,7 +119,7 @@ public function do_import(ImportToiletSanitasiRequest $request)
             return back()->with('error', 'Import data gagal.');
         }
 
-        return back()->with('success', 'Import data sukses.');
+        return redirect()->route('data.toilet_sanitasi.index')->with('success', 'Data berhasil diimpor!');        
     }
 
     /**
@@ -127,7 +132,7 @@ public function edit($id)
     {
         $toilet = ToiletSanitasi::with(['desa'])->findOrFail($id);
         $page_title = 'Toilet & Sanitasi';
-        $page_description = 'Ubah Toilet & Sanitasi : ' . $toilet->desa->nama;
+        $page_description = 'Ubah Toilet & Sanitasi : ' . nama_desa($toilet->desa_id);
 
         return view('data.toilet_sanitasi.edit', compact('page_title', 'page_description', 'toilet'));
     }
@@ -138,15 +143,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdateToiletSanitasiRequest $request, $id)
     {
-        request()->validate([
-            'toilet' => 'required',
-            'sanitasi' => 'required',
-        ]);
-
         try {
-            ToiletSanitasi::findOrFail($id)->update($request->all());
+            ToiletSanitasi::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Toilet Sanitasi update failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Requests/UpdateAKIAKBRequest.php b/app/Http/Requests/UpdateAKIAKBRequest.php
new file mode 100644
index 000000000..a5fb7cb4e
--- /dev/null
+++ b/app/Http/Requests/UpdateAKIAKBRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateAKIAKBRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'aki' => 'required|integer',
+            'akb' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'aki.required' => 'Jumlah AKI wajib diisi.',
+            'akb.required' => 'Jumlah AKB wajib diisi.',
+        ];
+    }
+}
diff --git a/app/Http/Requests/UpdateFasilitasPaudRequest.php b/app/Http/Requests/UpdateFasilitasPaudRequest.php
new file mode 100644
index 000000000..d7fd87a0b
--- /dev/null
+++ b/app/Http/Requests/UpdateFasilitasPaudRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateFasilitasPaudRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'jumlah_paud' => 'required|integer',
+            'jumlah_guru_paud' => 'required|integer',
+            'jumlah_siswa_paud' => 'required|integer',
+            'semester' => 'required|integer',
+            'tahun' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'jumlah_paud.required' => 'Jumlah PAUD wajib diisi.',
+            'jumlah_guru_paud.required' => 'Jumlah guru PAUD wajib diisi.',
+            'jumlah_siswa_paud.required' => 'Jumlah siswa PAUD wajib diisi.',
+            'semester.required' => 'Semester wajib diisi.',
+            'tahun.required' => 'Tahun wajib diisi.',
+        ];
+    }
+}
diff --git a/app/Http/Requests/UpdatePutusSekolahRequest.php b/app/Http/Requests/UpdatePutusSekolahRequest.php
new file mode 100644
index 000000000..eed6bca7c
--- /dev/null
+++ b/app/Http/Requests/UpdatePutusSekolahRequest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePutusSekolahRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'siswa_paud' => 'required|integer',
+            'anak_usia_paud' => 'required|integer',
+            'siswa_sd' => 'required|integer',
+            'anak_usia_sd' => 'required|integer',
+            'siswa_smp' => 'required|integer',
+            'anak_usia_smp' => 'required|integer',
+            'siswa_sma' => 'required|integer',
+            'anak_usia_sma' => 'required|integer',
+            'semester' => 'required|integer',
+            'tahun' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'siswa_paud.required' => 'Jumlah siswa PAUD wajib diisi.',
+            'anak_usia_paud.required' => 'Jumlah anak usia PAUD wajib diisi.',
+            'siswa_sd.required' => 'Jumlah siswa SD wajib diisi.',
+            'anak_usia_sd.required' => 'Jumlah anak usia SD wajib diisi.',
+            'siswa_smp.required' => 'Jumlah siswa SMP wajib diisi.',
+            'anak_usia_smp.required' => 'Jumlah anak usia SMP wajib diisi.',
+            'siswa_sma.required' => 'Jumlah siswa SMA wajib diisi.',
+            'anak_usia_sma.required' => 'Jumlah anak usia SMA wajib diisi.',
+            'semester.required' => 'Semester wajib diisi.',
+            'tahun.required' => 'Tahun wajib diisi.',
+        ];
+    }
+}
diff --git a/app/Http/Requests/UpdateToiletSanitasiRequest.php b/app/Http/Requests/UpdateToiletSanitasiRequest.php
new file mode 100644
index 000000000..545b15a8d
--- /dev/null
+++ b/app/Http/Requests/UpdateToiletSanitasiRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateToiletSanitasiRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'toilet' => 'required|integer',
+            'sanitasi' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'toilet.required' => 'Jumlah toilet wajib diisi.',
+            'sanitasi.required' => 'Jumlah sanitasi wajib diisi.',
+        ];
+    }
+}
diff --git a/catatan_rilis.md b/catatan_rilis.md
index 91948728b..607595d1b 100644
--- a/catatan_rilis.md
+++ b/catatan_rilis.md
@@ -15,6 +15,8 @@ Terimakasih [isi disini] yang telah berkontribusi langsung mengembangkan aplikas
 4. [#1731](https://github.com/OpenSID/OpenDK/issues/1731) Perbaikan menambah anggota penduduk untuk data suplemen tidak menampilkan list penduduk & keluarga.
 5. [#1732](https://github.com/OpenSID/OpenDK/issues/1732) Berkas download dokumen laporan-penduduk pada data tidak sikron dari OpenSID.
 6. [#1727](https://github.com/OpenSID/OpenDK/issues/1727) Perbaikan Tampilan Thumbnail Galeri dan Pratinjau Gambar Dinamis.
+7. [#1733](https://github.com/OpenSID/OpenDK/issues/1733) perbaikan filter kesehatan.
+
 
 #### TEKNIS
 
diff --git a/helpers/general_helper.php b/helpers/general_helper.php
index 5587f932d..badfabeb9 100644
--- a/helpers/general_helper.php
+++ b/helpers/general_helper.php
@@ -759,6 +759,20 @@ function kembalikanSlug($str): ?string
     return str_replace(['-', '.'], [' ', ''], $str);
 }
 
+if (! function_exists('list_desa')) {
+    function list_desa(bool $all = false)
+    {
+        return (new \App\Services\DesaService)->listDesa($all)->pluck('nama', 'desa_id');
+    }
+}
+
+if (! function_exists('nama_desa')) {
+    function nama_desa(string $desaId): ?string
+    {
+        return list_desa()[$desaId] ?? null;
+    }
+}
+
 if (! function_exists('is_pdf')) {
     function is_pdf($path = null, $mime = null): bool
     {
diff --git a/resources/views/data/aki_akb/index.blade.php b/resources/views/data/aki_akb/index.blade.php
index 1b3f012ee..f6ed834ed 100644
--- a/resources/views/data/aki_akb/index.blade.php
+++ b/resources/views/data/aki_akb/index.blade.php
@@ -55,7 +55,10 @@
                     url: "{!! route('data.aki-akb.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa_id = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -92,10 +95,11 @@ class: 'text-center',
                     [1, 'desc']
                 ]
             });
-
+            
             $('#list_desa').on('select2:select', function(e) {
-                data.columns(1).search(this.value).draw();
+                data.ajax.reload();
             });
+            
         });
     </script>
     @include('forms.datatable-vertical')
diff --git a/resources/views/data/anggaran_desa/index.blade.php b/resources/views/data/anggaran_desa/index.blade.php
index 3a445b4c4..38467f452 100644
--- a/resources/views/data/anggaran_desa/index.blade.php
+++ b/resources/views/data/anggaran_desa/index.blade.php
@@ -55,7 +55,10 @@
                     url: "{!! route('data.anggaran-desa.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/data_sarana/index.blade.php b/resources/views/data/data_sarana/index.blade.php
index 20f38c3e0..c8b620e7b 100644
--- a/resources/views/data/data_sarana/index.blade.php
+++ b/resources/views/data/data_sarana/index.blade.php
@@ -76,8 +76,11 @@
                     url: "{{ route('data.data-sarana.getdata') }}",
                     type: "POST",
                     data: function(d) {
-                        d.desa_id = $('#list_desa').val(),
-                            d.kategori = $('#kategori').val()
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
+                        d.kategori = $('#kategori').val()
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/epidemi_penyakit/index.blade.php b/resources/views/data/epidemi_penyakit/index.blade.php
index 85530fa9a..f2a34390b 100644
--- a/resources/views/data/epidemi_penyakit/index.blade.php
+++ b/resources/views/data/epidemi_penyakit/index.blade.php
@@ -62,7 +62,10 @@
                     url: "{!! route('data.epidemi-penyakit.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -99,7 +102,7 @@ class: 'text-center',
             });
 
             $('#list_desa').on('select2:select', function(e) {
-                data.columns(1).search(this.value).draw();
+                data.ajax.reload();
             });
         });
     </script>
diff --git a/resources/views/data/fasilitas_paud/edit.blade.php b/resources/views/data/fasilitas_paud/edit.blade.php
index 1a34d1dcf..c088134a5 100644
--- a/resources/views/data/fasilitas_paud/edit.blade.php
+++ b/resources/views/data/fasilitas_paud/edit.blade.php
@@ -29,7 +29,7 @@
                 @endif
 
                 <!-- form start -->
-                {!! html()->form()->open() !!}
+                {!! html()->form('PUT', route('data.fasilitas-paud.update', $fasilitas->id))->class('form-horizontal form-label-left')->open() !!}
 
                 <div class="box-body">
 
diff --git a/resources/views/data/fasilitas_paud/import.blade.php b/resources/views/data/fasilitas_paud/import.blade.php
index 10ecfde18..1d9d24f9d 100644
--- a/resources/views/data/fasilitas_paud/import.blade.php
+++ b/resources/views/data/fasilitas_paud/import.blade.php
@@ -43,11 +43,7 @@
                             <div class="form-group">
                                 <label for="list_desa" class="control-label col-md-4 col-sm-3 col-xs-12">{{ config('setting.sebutan_desa') }}</label>
                                 <div class="col-md-8">
-                                    <select class="form-control" id="list_desa" name="desa_id">
-                                        @foreach (\App\Models\DataDesa::all() as $desa)
-                                            <option value="{{ $desa->desa_id }}">{{ $desa->nama }}</option>
-                                        @endforeach
-                                    </select>
+                                    @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'desa_id','data-width' => '100%', 'required' => 'required']])
                                 </div>
                             </div>
 
@@ -106,7 +102,7 @@
 @push('scripts')
     <script>
         $(function() {
-
+            $('#list_desa option[value="Semua"]').val('');
             function readURL(input) {
                 if (input.files && input.files[0]) {
                     var reader = new FileReader();
diff --git a/resources/views/data/fasilitas_paud/index.blade.php b/resources/views/data/fasilitas_paud/index.blade.php
index cdcc22a5b..5d826c130 100644
--- a/resources/views/data/fasilitas_paud/index.blade.php
+++ b/resources/views/data/fasilitas_paud/index.blade.php
@@ -56,7 +56,10 @@
                     url: "{!! route('data.fasilitas-paud.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -67,7 +70,7 @@ class: 'text-center',
                         orderable: false
                     },
                     {
-                        data: 'desa.nama',
+                        data: 'nama_desa',
                         name: 'desa.nama'
                     },
                     {
diff --git a/resources/views/data/imunisasi/form_edit.blade.php b/resources/views/data/imunisasi/form_edit.blade.php
index 88c20e776..4b1de19e2 100644
--- a/resources/views/data/imunisasi/form_edit.blade.php
+++ b/resources/views/data/imunisasi/form_edit.blade.php
@@ -2,13 +2,13 @@
     <label for="cakupan_imunisasi" class="control-label col-md-4 col-sm-3 col-xs-12">Cakupan Imunisasi<span class="required">*</span></label>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        {!! html()->number('cakupan_imunisasi', old('cakupan_imunisasi'))->class('form-control')->required()->id('cakupan_imunisasi') !!}
+        {!! html()->number('cakupan_imunisasi', old('cakupan_imunisasi') ?? $imunisasi->cakupan_imunisasi)->class('form-control')->required()->id('cakupan_imunisasi') !!}
     </div>
 </div>
 <div class="form-group">
     <label for="bulan" class="control-label col-md-4 col-sm-3 col-xs-12">Bulan</label>
 
-    <div class="col-md-8">
+    <div class="col-md-6 col-sm-6 col-xs-12">
         <select class="form-control" id="bulan" name="bulan">
             @foreach (months_list() as $key => $month)
                 @if ($imunisasi->bulan == $key)
@@ -24,7 +24,7 @@
 <div class="form-group">
     <label for="list_year" class="control-label col-md-4 col-sm-3 col-xs-12">Tahun</label>
 
-    <div class="col-md-8">
+    <div class="col-md-6 col-sm-6 col-xs-12">
         <select class="form-control" id="list_year" name="tahun">
             @foreach (years_list() as $year)
                 @if ($imunisasi->tahun == $year)
diff --git a/resources/views/data/imunisasi/index.blade.php b/resources/views/data/imunisasi/index.blade.php
index 610e6758d..dd36dbe99 100644
--- a/resources/views/data/imunisasi/index.blade.php
+++ b/resources/views/data/imunisasi/index.blade.php
@@ -54,7 +54,10 @@
                     url: "{!! route('data.imunisasi.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -87,7 +90,7 @@ class: 'text-center',
             });
 
             $('#list_desa').on('select2:select', function(e) {
-                data.columns(1).search(this.value).draw();
+                data.ajax.reload();
             });
         });
     </script>
diff --git a/resources/views/data/keluarga/index.blade.php b/resources/views/data/keluarga/index.blade.php
index 93ec0a1cb..08d1f3e36 100644
--- a/resources/views/data/keluarga/index.blade.php
+++ b/resources/views/data/keluarga/index.blade.php
@@ -68,7 +68,10 @@
                     url: "{!! route('data.keluarga.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/laporan-apbdes/index.blade.php b/resources/views/data/laporan-apbdes/index.blade.php
index ba3e81786..0d3117c37 100644
--- a/resources/views/data/laporan-apbdes/index.blade.php
+++ b/resources/views/data/laporan-apbdes/index.blade.php
@@ -72,7 +72,10 @@
                     url: "{!! route('data.laporan-apbdes.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/laporan-penduduk/index.blade.php b/resources/views/data/laporan-penduduk/index.blade.php
index d28337509..c04161672 100644
--- a/resources/views/data/laporan-penduduk/index.blade.php
+++ b/resources/views/data/laporan-penduduk/index.blade.php
@@ -68,7 +68,10 @@
                     url: "{!! route('data.laporan-penduduk.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/pembangunan/index.blade.php b/resources/views/data/pembangunan/index.blade.php
index 1e0886754..544f3c208 100644
--- a/resources/views/data/pembangunan/index.blade.php
+++ b/resources/views/data/pembangunan/index.blade.php
@@ -70,7 +70,10 @@
                     url: "{!! route('data.pembangunan.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/penduduk/index.blade.php b/resources/views/data/penduduk/index.blade.php
index 92b8abb72..801ac1fe8 100644
--- a/resources/views/data/penduduk/index.blade.php
+++ b/resources/views/data/penduduk/index.blade.php
@@ -72,7 +72,10 @@
                     url: "{!! route('data.penduduk.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/program_bantuan/index.blade.php b/resources/views/data/program_bantuan/index.blade.php
index e0044707e..2519b9123 100644
--- a/resources/views/data/program_bantuan/index.blade.php
+++ b/resources/views/data/program_bantuan/index.blade.php
@@ -65,7 +65,10 @@
                     url: "{!! route('data.program-bantuan.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
 
diff --git a/resources/views/data/putus_sekolah/import.blade.php b/resources/views/data/putus_sekolah/import.blade.php
index d8f671dad..871e8ff2e 100644
--- a/resources/views/data/putus_sekolah/import.blade.php
+++ b/resources/views/data/putus_sekolah/import.blade.php
@@ -43,11 +43,7 @@
                                 <label for="list_desa" class="control-label col-md-4 col-sm-3 col-xs-12">{{ config('setting.sebutan_desa') }}</label>
 
                                 <div class="col-md-8">
-                                    <select class="form-control" id="list_desa" name="desa_id">
-                                        @foreach (\App\Models\DataDesa::all() as $desa)
-                                            <option value="{{ $desa->desa_id }}">{{ $desa->nama }}</option>
-                                        @endforeach
-                                    </select>
+                                    @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'desa_id','data-width' => '100%', 'required' => 'required']])
                                 </div>
                             </div>
 
@@ -108,7 +104,7 @@
 @push('scripts')
     <script>
         $(function() {
-
+            $('#list_desa option[value="Semua"]').val('');
             function readURL(input) {
                 if (input.files && input.files[0]) {
                     var reader = new FileReader();
diff --git a/resources/views/data/putus_sekolah/index.blade.php b/resources/views/data/putus_sekolah/index.blade.php
index 81be3ef24..65826f735 100644
--- a/resources/views/data/putus_sekolah/index.blade.php
+++ b/resources/views/data/putus_sekolah/index.blade.php
@@ -61,7 +61,10 @@
                     url: "{!! route('data.putus-sekolah.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -72,7 +75,7 @@ class: 'text-center',
                         orderable: false
                     },
                     {
-                        data: 'desa.nama',
+                        data: 'nama_desa',
                         name: 'desa.nama'
                     },
                     {
diff --git a/resources/views/data/tingkat_pendidikan/import.blade.php b/resources/views/data/tingkat_pendidikan/import.blade.php
index 5f788c3af..b8e02ce40 100644
--- a/resources/views/data/tingkat_pendidikan/import.blade.php
+++ b/resources/views/data/tingkat_pendidikan/import.blade.php
@@ -42,12 +42,8 @@
                             <div class="form-group">
                                 <label for="list_desa" class="control-label col-md-4 col-sm-3 col-xs-12">{{ config('setting.sebutan_desa') }}</label>
 
-                                <div class="col-md-8">
-                                    <select class="form-control" id="list_desa" name="desa_id">
-                                        @foreach (\App\Models\DataDesa::all() as $desa)
-                                            <option value="{{ $desa->desa_id }}">{{ $desa->nama }}</option>
-                                        @endforeach
-                                    </select>
+                                <div class="col-md-8">                                    
+                                    @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'desa_id','data-width' => '100%', 'required' => 'required']])
                                 </div>
                             </div>
 
@@ -108,7 +104,7 @@
 @push('scripts')
     <script>
         $(function() {
-
+            $('#list_desa option[value="Semua"]').val('');
             function readURL(input) {
                 if (input.files && input.files[0]) {
                     var reader = new FileReader();
diff --git a/resources/views/data/tingkat_pendidikan/index.blade.php b/resources/views/data/tingkat_pendidikan/index.blade.php
index bda5d58d6..38349bb15 100644
--- a/resources/views/data/tingkat_pendidikan/index.blade.php
+++ b/resources/views/data/tingkat_pendidikan/index.blade.php
@@ -59,7 +59,10 @@
                     url: "{!! route('data.tingkat-pendidikan.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -71,7 +74,7 @@ class: 'text-center',
                     },
                     // {data: 'id', id: 'id'},
                     {
-                        data: 'desa.nama',
+                        data: 'nama_desa',
                         name: 'desa.nama'
                     },
                     {
diff --git a/resources/views/data/toilet_sanitasi/form_edit.blade.php b/resources/views/data/toilet_sanitasi/form_edit.blade.php
index 0f0ee5387..4fc0b8202 100644
--- a/resources/views/data/toilet_sanitasi/form_edit.blade.php
+++ b/resources/views/data/toilet_sanitasi/form_edit.blade.php
@@ -2,20 +2,20 @@
     <label for="toilet" class="control-label col-md-4 col-sm-3 col-xs-12">Toilet <span class="required">*</span></label>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        {!! html()->number('toilet', old('toilet'))->class('form-control')->required()->id('toilet') !!}
+        {!! html()->number('toilet', old('toilet', $toilet->toilet))->class('form-control')->required()->id('toilet') !!}
     </div>
 </div>
 <div class="form-group">
     <label for="sanitasi" class="control-label col-md-4 col-sm-3 col-xs-12">Sanitasi <span class="required">*</span></label>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        {!! html()->number('sanitasi', old('sanitasi'))->class('form-control')->required()->id('sanitasi') !!}
+        {!! html()->number('sanitasi', old('sanitasi', $toilet->sanitasi))->class('form-control')->required()->id('sanitasi') !!}
     </div>
 </div>
 <div class="form-group">
     <label for="bulan" class="control-label col-md-4 col-sm-3 col-xs-12">Bulan</label>
 
-    <div class="col-md-8">
+    <div class="col-md-6 col-sm-6 col-xs-12">
         <select class="form-control" id="bulan" name="bulan">
             @foreach (months_list() as $key => $month)
                 @if ($toilet->bulan == $key)
@@ -31,7 +31,7 @@
 <div class="form-group">
     <label for="list_year" class="control-label col-md-4 col-sm-3 col-xs-12">Tahun</label>
 
-    <div class="col-md-8">
+    <div class="col-md-6 col-sm-6 col-xs-12">
         <select class="form-control" id="list_year" name="tahun">
             @foreach (years_list() as $year)
                 @if ($toilet->tahun == $year)
diff --git a/resources/views/data/toilet_sanitasi/import.blade.php b/resources/views/data/toilet_sanitasi/import.blade.php
index 4002aa89c..cfacebbeb 100644
--- a/resources/views/data/toilet_sanitasi/import.blade.php
+++ b/resources/views/data/toilet_sanitasi/import.blade.php
@@ -95,7 +95,7 @@
 @push('scripts')
     <script>
         $(function() {
-
+            $('#list_desa option[value="Semua"]').val('');  
             function readURL(input) {
                 if (input.files && input.files[0]) {
                     var reader = new FileReader();
diff --git a/resources/views/data/toilet_sanitasi/index.blade.php b/resources/views/data/toilet_sanitasi/index.blade.php
index 9c2c7aecb..f779b03d6 100644
--- a/resources/views/data/toilet_sanitasi/index.blade.php
+++ b/resources/views/data/toilet_sanitasi/index.blade.php
@@ -54,7 +54,10 @@
                 ajax: {
                     url: "{!! route('data.toilet-sanitasi.getdata') !!}",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -91,7 +94,7 @@ class: 'text-center',
             });
 
             $('#list_desa').on('select2:select', function(e) {
-                data.columns(1).search(this.value).draw();
+                data.ajax.reload();
             });
         });
     </script>