diff --git a/.gitignore b/.gitignore
index 2f80c974..2a8d84d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ Homestead.yaml
 .env
 /nbproject/private/
 /config/renewal.php
+.DS_Store
\ No newline at end of file
diff --git a/app/Http/Controllers/ActorController.php b/app/Http/Controllers/ActorController.php
index 7d718ae2..72eb6221 100644
--- a/app/Http/Controllers/ActorController.php
+++ b/app/Http/Controllers/ActorController.php
@@ -27,7 +27,14 @@ public function index(Request $request)
                 $actor = $actor->where('warn', 1);
                 break;
         }
-        $actorslist = $actor->with('company')->orderby('name')->paginate(21);
+
+        $query = $actor->with('company')->orderby('name');
+
+        if ($request->wantsJson()) {
+            return response()->json($query->get());
+        }
+
+        $actorslist = $query->paginate(21);
         $actorslist->appends($request->input())->links();
 
         return view('actor.index', compact('actorslist'));
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 2a4a5ea6..ddfbb9bd 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -24,6 +24,10 @@ public function index(Request $request)
 
         $categories = $category->get();
 
+        if ($request->wantsJson()) {
+            return response()->json($categories);
+        }
+
         return view('category.index', compact('categories'));
     }
 
diff --git a/app/Http/Controllers/ClassifierTypeController.php b/app/Http/Controllers/ClassifierTypeController.php
index 4032bc93..0d5e24e4 100644
--- a/app/Http/Controllers/ClassifierTypeController.php
+++ b/app/Http/Controllers/ClassifierTypeController.php
@@ -24,6 +24,10 @@ public function index(Request $request)
 
         $types = $classifierType->with(['category:code,category'])->get();
 
+        if ($request->wantsJson()) {
+            return response()->json($types);
+        }
+
         return view('classifier_type.index', compact('types'));
     }
 
diff --git a/app/Http/Controllers/DefaultActorController.php b/app/Http/Controllers/DefaultActorController.php
index 35993375..54febdda 100644
--- a/app/Http/Controllers/DefaultActorController.php
+++ b/app/Http/Controllers/DefaultActorController.php
@@ -43,6 +43,10 @@ public function index(Request $request)
         }
         $default_actors = $default_actor->with(['roleInfo:code,name', 'actor:id,name', 'client:id,name', 'category:code,category', 'country:iso,name'])->get();
 
+        if ($request->wantsJson()) {
+            return response()->json($default_actors);
+        }
+
         return view('default_actor.index', compact('default_actors'));
     }
 
diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index f8b4eca9..209277f3 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -28,7 +28,13 @@ public function index(Request $request)
             $template_classes = $template_classes->whereLike('notes', $Notes.'%');
         }
 
-        $template_classes = $template_classes->orderby('name')->simplePaginate(config('renewal.general.paginate') == 0 ? 25 : intval(config('renewal.general.paginate')));
+        $query = $template_classes->orderby('name');
+
+        if ($request->wantsJson()) {
+            return response()->json($query->get());
+        }
+
+        $template_classes = $query->simplePaginate(config('renewal.general.paginate') == 0 ? 25 : intval(config('renewal.general.paginate')));
         $template_classes->appends($request->input())->links();
 
         return view('documents.index', compact('template_classes'));
diff --git a/app/Http/Controllers/EventNameController.php b/app/Http/Controllers/EventNameController.php
index edeea8ea..4f7dfef0 100644
--- a/app/Http/Controllers/EventNameController.php
+++ b/app/Http/Controllers/EventNameController.php
@@ -22,6 +22,10 @@ public function index(Request $request)
             $ename = $ename->whereJsonLike('name', $Name);
         }
 
+        if ($request->wantsJson()) {
+            return response()->json($ename->get());
+        }
+
         $enameslist = $ename->paginate(21);
         $enameslist->appends($request->input())->links();
 
diff --git a/app/Http/Controllers/FeeController.php b/app/Http/Controllers/FeeController.php
index cc3afbac..c4eb8265 100644
--- a/app/Http/Controllers/FeeController.php
+++ b/app/Http/Controllers/FeeController.php
@@ -25,7 +25,14 @@ public function index(Request $request)
                 }
             }
         }
-        $fees = $fees->orderBy('for_category')->orderBy('for_country')->orderBy('qt')->simplePaginate(config('renewal.general.paginate') == 0 ? 25 : intval(config('renewal.general.paginate')));
+
+        $query = $fees->orderBy('for_category')->orderBy('for_country')->orderBy('qt');
+
+        if ($request->wantsJson()) {
+            return response()->json($query->get());
+        }
+
+        $fees = $query->simplePaginate(config('renewal.general.paginate') == 0 ? 25 : intval(config('renewal.general.paginate')));
 
         return view('fee.index', compact('fees'));
     }
diff --git a/app/Http/Controllers/MatterController.php b/app/Http/Controllers/MatterController.php
index 91c2fdfc..e8ebf7aa 100644
--- a/app/Http/Controllers/MatterController.php
+++ b/app/Http/Controllers/MatterController.php
@@ -38,25 +38,31 @@ public function index(Request $request)
     {
         $filters = $request->except(
             [
-                'display_with',
-                'page',
-                'filter',
-                'value',
-                'sortkey',
-                'sortdir',
-                'tab',
-                'include_dead',
-            ]
-        );
+            'display_with',
+            'page',
+            'filter',
+            'value',
+            'sortkey',
+            'sortdir',
+            'tab',
+            'include_dead',
+        ]);
 
-        $matters = Matter::filter(
+        $query = Matter::filter(
             $request->input('sortkey', 'id'),
             $request->input('sortdir', 'desc'),
             $filters,
             $request->display_with,
             $request->include_dead
-        )->simplePaginate(25);
-        $matters->withQueryString()->links(); // Keep URL parameters in the paginator links
+        );
+
+        if ($request->wantsJson()) {
+            $matters = $query->with('events.info')->get();
+            return response()->json($matters);
+        }
+
+        $matters = $query->simplePaginate(25);
+        $matters->withQueryString()->links();  // Keep URL parameters in the paginator links
 
         return view('matter.index', compact('matters'));
     }
diff --git a/app/Http/Controllers/MatterTypeController.php b/app/Http/Controllers/MatterTypeController.php
index c75c3cff..05d09a26 100644
--- a/app/Http/Controllers/MatterTypeController.php
+++ b/app/Http/Controllers/MatterTypeController.php
@@ -24,6 +24,10 @@ public function index(Request $request)
 
         $matter_types = $type->get();
 
+        if ($request->wantsJson()) {
+            return response()->json($matter_types);
+        }
+
         return view('type.index', compact('matter_types'));
     }
 
diff --git a/app/Http/Controllers/RenewalController.php b/app/Http/Controllers/RenewalController.php
index 143d94cb..f39a0a68 100644
--- a/app/Http/Controllers/RenewalController.php
+++ b/app/Http/Controllers/RenewalController.php
@@ -96,6 +96,17 @@ public function index(Request $request)
             $renewals->orderByDesc('due_date');
         }
 
+        if ($request->wantsJson()) {
+            $renewals = $renewals->get();
+            $renewals->transform(function ($ren) {
+                $this->adjustFees($ren, $cost, $fee);
+                $ren->cost = $cost;
+                $ren->fee = $fee;
+                return $ren;
+            });
+            return response()->json($renewals);
+        }
+
         $renewals = $renewals->simplePaginate(config('renewal.general.paginate', 25));
 
         // Adjust the cost and fee of each renewal based on customized settings
@@ -106,7 +117,7 @@ public function index(Request $request)
             return $ren;
         });
         
-$renewals->appends($request->input())->links(); // Keep URL parameters in the paginator links
+        $renewals->appends($request->input())->links(); // Keep URL parameters in the paginator links
         return view('renewals.index', compact('renewals', 'step', 'invoice_step'));
     }
 
diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index 491a8926..312b6314 100644
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -25,6 +25,10 @@ public function index(Request $request)
 
         $roles = $role->get();
 
+        if ($request->wantsJson()) {
+            return response()->json($roles);
+        }
+
         return view('role.index', compact('roles'));
     }
 
diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index b46aa41b..0c838561 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -57,11 +57,16 @@ public function index(Request $request)
             $rule = $rule->whereLike('for_origin', "{$Origin}%");
         }
         
-        $ruleslist = $rule->with(['country:iso,name', 'trigger:code,name', 'category:code,category', 'origin:iso,name', 'type:code,type', 'taskInfo:code,name'])
+        $query = $rule->with(['country:iso,name', 'trigger:code,name', 'category:code,category', 'origin:iso,name', 'type:code,type', 'taskInfo:code,name'])
             ->select('task_rules.*')
             ->join('event_name AS t', 't.code', '=', 'task_rules.task')
-            ->orderByRaw("t.name->>'$.$baseLocale'")
-            ->paginate(21);
+            ->orderByRaw("t.name->>'$.$baseLocale'");
+
+        if ($request->wantsJson()) {
+            return response()->json($query->get());
+        }
+
+        $ruleslist = $query->paginate(21);
         $ruleslist->appends($request->input())->links();
 
         return view('rule.index', compact('ruleslist'));
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index c7fb7cc9..ef0a6a76 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -47,7 +47,13 @@ public function index(Request $request)
                 });
         }
 
-        $tasks = $tasks->orderBy('due_date')->simplePaginate(18)
+        $query = $tasks->orderBy('due_date');
+
+        if ($request->wantsJson()) {
+            return response()->json($query->get());
+        }
+
+        $tasks = $query->simplePaginate(18)
             ->appends($request->input());
 
         return view('task.index', compact('tasks', 'isrenewals'));
diff --git a/app/Http/Controllers/TemplateMemberController.php b/app/Http/Controllers/TemplateMemberController.php
index 7248fc78..311de714 100644
--- a/app/Http/Controllers/TemplateMemberController.php
+++ b/app/Http/Controllers/TemplateMemberController.php
@@ -42,7 +42,13 @@ public function index(Request $request)
             $template_members = $template_members->where('style', 'LIKE', "$Style%");
         }
 
-        $template_members = $template_members->orderBy('summary')->simplePaginate(config('renewal.general.paginate') == 0 ? 25 : intval(config('renewal.general.paginate')));
+        $query = $template_members->orderBy('summary');
+
+        if ($request->wantsJson()) {
+            return response()->json($query->get());
+        }
+
+        $template_members = $query->simplePaginate(config('renewal.general.paginate') == 0 ? 25 : intval(config('renewal.general.paginate')));
         $template_members->appends($request->input())->links();
 
         return view('template-members.index', compact('template_members'));
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index b0df4509..f9a825bf 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -19,7 +19,14 @@ public function index(Request $request)
         if ($request->filled('Name')) {
             $user = $user->where('name', 'like', $request->Name . '%');
         }
-        $userslist = $user->with('company')->orderby('name')->paginate(21);
+
+        $query = $user->with('company')->orderby('name');
+
+        if ($request->wantsJson()) {
+            return response()->json($query->get());
+        }
+
+        $userslist = $query->paginate(21);
         $userslist->appends($request->input())->links();
 
         return view('user.index', compact('userslist'));