diff --git a/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php b/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php
index a055cd290..7be9209c2 100644
--- a/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php
+++ b/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php
@@ -57,6 +57,24 @@ class MiningTaxesAdminController extends Controller
                                                      ->with('totalAmount', $totalAmount);
     }
 
+    /**
+     * Search unpaid invoices
+     */
+    public function SearchUnpaidInvoice(Request $request) {
+        $invoices = Invoice::where('invoice_id', 'LIKE', '%' . $request->q . '%')
+                           ->where(['status' => 'Pending'])
+                           ->orWhere(['status' => 'Late'])
+                           ->orWhere(['status' => 'Deferred'])
+                           ->orderByDesc('invoice_id')
+                           ->paginate(25);
+
+        if(count($invoices) > 0) {
+            return view('miningtax.admin.display.unpaid')->with('invoices', $invoices);
+        }
+
+        return view('miningtax.admin.display.unpaid')->with('error', 'No invoices found');
+    }
+
     /**
      * Mark an invoice paid
      */
diff --git a/resources/views/miningtax/admin/display/unpaid.blade.php b/resources/views/miningtax/admin/display/unpaid.blade.php
index 86dffb7c6..98d108312 100644
--- a/resources/views/miningtax/admin/display/unpaid.blade.php
+++ b/resources/views/miningtax/admin/display/unpaid.blade.php
@@ -14,15 +14,12 @@
                     </div>
                     <div class="column">
                         <div class="container">
-                        <form action="/miningtax/admin/display/unpaid/search" method="POST" role="search">
-                            {{ csrf_field() }}
-                            <div class="input-group">
-                                <input type="text" class="form-control" name="q" placeholder="Search Invoices">
-                                <span class="input-group-btn">
-                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-                                </span>
+                        {!! Form::open(['action' => 'MiningTaxes\MiningTaxesAdminController@SearchUnpaidInvoice', 'method' => 'POST']) !!}
+                            <div class="form-group">
+                                {{ Form::text('q', '', ['class' => 'form-control']) }}
+                                {{ Form::submit('Search', ['class' => 'btn btn-primary']) }}
                             </div>
-                        </form>
+                        {!! Form::close() !!}
                         </div>	
                     </div>
                 </div>
diff --git a/routes/web.php b/routes/web.php
index 1072302e2..6538df26a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -86,25 +86,7 @@ Route::group(['middleware' => ['auth']], function(){
     Route::post('/miningtax/admin/update/invoice', 'MiningTaxes\MiningTaxesAdminController@UpdateInvoice');
     Route::post('/miningtax/admin/delete/invoice', 'MiningTaxes\MiningTaxesAdminController@DeleteInvoice');
     Route::get('/miningtax/admin/display/paid', 'MiningTaxes\MiningTaxesAdminController@DisplayPaidInvoices');
-    Route::any('/miningtax/admin/display/unpaid/search', function() {
-        $q = Illuminate\Support\Facades\Input::get('q');
-        if($q != "") {
-            $invoices = App\Models\MiningTax\Invoice::where('invoice_id', 'LIKE', '%' . $q . '%')
-                                ->where(['status' => 'Pending'])
-                                ->orWhere(['status' => 'Late'])
-                                ->orWhere(['status' => 'Deferred'])
-                                ->orderByDesc('invoice_id')
-                                ->paginate(25)
-                                ->setPath('');
-            $pagination = $invoices->appends(array('q' => Illuminate\Support\Facades\Input::get('q')));
-
-            if(count($invoices) > 0) {
-                return view('miningtax.admin.display.unpaid')->withDetails($invoices)->withQuery($q);
-            }
-
-            return view('miningtax.admin.display.unpaid')->with('error', 'No invoices found.  Try to search again!');
-        }
-    });
+    Route::any('/miningtax/admin/display/unpaid/search', 'MiningTaxes\MiningTaxesAdminController@SearchUnpaidInvoice');
     
     /**
      * Scopes Controller display pages