diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php
index daaa89e..62d31b0 100644
--- a/app/Http/Controllers/FrontController.php
+++ b/app/Http/Controllers/FrontController.php
@@ -66,12 +66,34 @@ class FrontController extends Controller
     function dataset() {
         $data = [];
 
-        if(@request()->key){
-            $data['dataset'] = Dataset::where('name','ilike','%'.request()->key.'%')->orderBy('DatasetId','DESC')->paginate(9);    
-        }else{
-            $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->paginate(9);
+        $key            = @request()->key;
+        $tahun          = @request()->tahun;
+        $instansi_id    = decode_id(@request()->instansi_id);
+        $resource_id    = decode_id(@request()->resource_id);
+
+        $dataset = Dataset::orderBy('DatasetId','DESC');
+        if(@$key){
+            $dataset->where('name','ilike','%'.@$key.'%');
         }
 
+        if(@$tahun){
+            $dataset->where('tahun',@$tahun);
+        }
+
+        if(@$instansi_id){
+            $dataset->where('instansi_id',@$instansi_id);
+        }
+
+        if(@$resource_id){
+            $dataset->where('template_id',@$resource_id);
+        }
+
+        // if(@request()->key){
+        //     $data['dataset'] = Dataset::where('name','ilike','%'.request()->key.'%')->orderBy('DatasetId','DESC')->paginate(9);    
+        // }else{
+        //     $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->paginate(9);
+        // }
+        $data['dataset'] = $dataset->paginate(9);
         $data['template'] = Template::all();
         $data['instansi'] = Instansi::all();
         
@@ -79,11 +101,40 @@ class FrontController extends Controller
     }
     function datasetTambahan() {
         $data = [];
-        if(@request()->key){
-            $data['dataset'] = DatasetTambahan::where('name','ilike','%'.request()->key.'%')->orderBy('DatasetTambahanId','DESC')->paginate(10);    
-        }else{
-            $data['dataset'] = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->paginate(10);
+        $key            = @request()->key;
+        $tahun          = @request()->tahun;
+        $instansi_id    = decode_id(@request()->instansi_id);
+        $resource_id    = decode_id(@request()->resource_id);
+
+        $dataset = DatasetTambahan::orderBy('DatasetTambahanId','DESC');
+        if(@$key){
+            $dataset->where('name','ilike','%'.@$key.'%');
         }
+
+        if(@$tahun){
+            $dataset->where('tahun',@$tahun);
+        }
+
+        if(@$instansi_id){
+            $dataset->where('instansi_id',@$instansi_id);
+        }
+
+        if(@$resource_id){
+            $dataset->where('template_id',@$resource_id);
+        }
+
+        
+
+        
+
+        // if(@request()->key){
+        //     $data['dataset'] = DatasetTambahan::->orderBy('DatasetTambahanId','DESC')->paginate(10);    
+        // }else{
+        //     $data['dataset'] = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->paginate(10);
+        // }
+
+        $data['dataset'] = $dataset->paginate(9);
+
         $data['template'] = Template::all();
         $data['instansi'] = Instansi::all();
         return view('dataset-tambahan',$data);
diff --git a/resources/views/dataset-tambahan.blade.php b/resources/views/dataset-tambahan.blade.php
index 5e1eedf..0bd4f86 100644
--- a/resources/views/dataset-tambahan.blade.php
+++ b/resources/views/dataset-tambahan.blade.php
@@ -61,7 +61,7 @@
                         </select>
                     </div>
                     <div class="w-full">
-                        <button class="">Cari</button>
+                        <button class="rounded-full bg-[#E9811A] text-white px-2 py-1">Cari</button>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/dataset.blade.php b/resources/views/dataset.blade.php
index aa7bc33..aa01e94 100644
--- a/resources/views/dataset.blade.php
+++ b/resources/views/dataset.blade.php
@@ -23,6 +23,7 @@
     <section class="container py-20 px-5">
         <div class="flex flex-col lg:flex-row gap-6">
             <div class="bg-white text-center h-full rounded-[20px] shadow-lg p-5 py-10 gap-3 w-full lg:w-1/4">
+                <form action="" method="GET">
                 <div class="flex justify-between">
                     <div>
                         <h1 class="bold">Filter</h1>
@@ -34,7 +35,7 @@
                 <div class="flex flex-col gap-6 mt-6">
                     <div class="w-full">
                         <h1 class="mb-3 text-left">Instansi</h1>
-                        <select class="form-input select2 rounded-[20px] w-full" name="" id="">
+                        <select class="form-input select2 rounded-[20px] w-full" name="instansi_id" id="">
                             <option value="">-- Pilih Instansi --</option>
                             @foreach ($instansi as $dataInstansi)
                                 <option value="{{encode_id($dataInstansi->MsInstansiId)}}">{{$dataInstansi->name}}</option>
@@ -43,7 +44,7 @@
                     </div>
                     <div class="w-full">
                         <h1 class="mb-3 text-left">Resource Data</h1>
-                        <select class="form-input select2 rounded-[20px] w-full" name="" id="">
+                        <select class="form-input select2 rounded-[20px] w-full" name="resource_id" id="">
                             <option value="">-- Pilih Resource Data --</option>
                             @foreach ($template as $dataTemp)
                                 <option value="{{encode_id($dataTemp->MsTemplateId)}}">{{$dataTemp->name}}</option>
@@ -53,7 +54,7 @@
 
                     <div class="w-full">
                         <h1 class="mb-3 text-left">Tahun</h1>
-                        <select class="form-input select2 rounded-[20px] w-full" name="" id="">
+                        <select class="form-input select2 rounded-[20px] w-full" name="tahun" id="">
                             <option value="">-- Pilih Tahun --</option>
                             @for($i = date('Y'); $i >= (date('Y')-10); $i--)
                                 <option value="">{{$i}}</option>
@@ -61,9 +62,10 @@
                         </select>
                     </div>
                     <div class="w-full">
-                        <button class="">Cari</button>
+                        <button class="rounded-full bg-[#E9811A] text-white px-2 py-1">Cari</button>
                     </div>
                 </div>
+                </form>
             </div>
             <div class="w-full lg:w-3/4">
                 <div class="grid grid-cols-2 lg:grid-cols-3 gap-6">