diff --git a/app/Http/Controllers/Admin/AirportController.php b/app/Http/Controllers/Admin/AirportController.php
index 03b213ce..04332ff4 100644
--- a/app/Http/Controllers/Admin/AirportController.php
+++ b/app/Http/Controllers/Admin/AirportController.php
@@ -41,7 +41,9 @@ class AirportController extends BaseController
         }
 
         $this->airportRepository->pushCriteria(new WhereCriteria($request, $where));
-        $airports = $this->airportRepository->orderBy('icao', 'asc')->paginate(40);
+        $airports = $this->airportRepository
+                         ->orderBy('icao', 'asc')
+                         ->paginate();
 
         return view('admin.airports.index', [
             'airports' => $airports,
diff --git a/app/Http/Controllers/Api/AirlineController.php b/app/Http/Controllers/Api/AirlineController.php
index d9882a6b..3d956331 100644
--- a/app/Http/Controllers/Api/AirlineController.php
+++ b/app/Http/Controllers/Api/AirlineController.php
@@ -27,9 +27,10 @@ class AirlineController extends RestController
      */
     public function index(Request $request)
     {
+        #$this->airlineRepo->pushCriteria(new RequestCriteria($request));
         $airports = $this->airlineRepo
             ->whereOrder(['active' => true], 'name', 'asc')
-            ->paginate(50);
+            ->paginate();
 
         return AirlineResource::collection($airports);
     }
diff --git a/app/Http/Controllers/Api/AirportController.php b/app/Http/Controllers/Api/AirportController.php
index 972ccdbe..a4faee74 100644
--- a/app/Http/Controllers/Api/AirportController.php
+++ b/app/Http/Controllers/Api/AirportController.php
@@ -37,7 +37,7 @@ class AirportController extends RestController
 
         $airports = $this->airportRepo
             ->whereOrder($where, 'icao', 'asc')
-            ->paginate(50);
+            ->paginate();
 
         return AirportResource::collection($airports);
     }
@@ -53,7 +53,7 @@ class AirportController extends RestController
 
         $airports = $this->airportRepo
             ->whereOrder($where, 'icao', 'asc')
-            ->paginate(50);
+            ->paginate();
 
         return AirportResource::collection($airports);
     }
diff --git a/app/Http/Controllers/Frontend/UserController.php b/app/Http/Controllers/Frontend/UserController.php
index 3232963d..2245df51 100644
--- a/app/Http/Controllers/Frontend/UserController.php
+++ b/app/Http/Controllers/Frontend/UserController.php
@@ -28,7 +28,7 @@ class UserController extends Controller
     {
         return $this->view('users.index',[
             'country' => new \League\ISO3166\ISO3166(),
-            'users' => $this->userRepo->orderBy('name', 'desc')->paginate(25),
+            'users' => $this->userRepo->orderBy('name', 'desc')->paginate(),
         ]);
     }
 }
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index 135ec9c3..4f2a5935 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -44,7 +44,7 @@ abstract class BaseRepository extends \Prettus\Repository\Eloquent\BaseRepositor
      * @param string $sort_by created_at (default) or updated_at
      * @return mixed
      */
-    public function recent($count = 5, $sort_by = 'created_at')
+    public function recent($count = null, $sort_by = 'created_at')
     {
         return $this->orderBy($sort_by, 'desc')->paginate($count);
     }