diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index e65025ae1..dff70ebbe 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -460,8 +460,14 @@ class AssetsController extends Controller
             $asset->location_id = ($target) ? $target->id : '';
 
         } elseif (request('checkout_to_type')=='asset') {
+
+            if (request('assigned_asset') == $assetId) {
+                return redirect()->back()->with('error', 'You cannot check an asset out to itself.');
+            }
+
             $target = Asset::where('id','!=',$assetId)->find(request('assigned_asset'));
             $asset->location_id = $target->rtd_location_id;
+
             // Override with the asset's location_id if it has one
             if ($target->location_id!='') {
                 $asset->location_id = ($target) ? $target->location_id : '';
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index f01797ef5..5e79e4015 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -627,19 +627,24 @@
               <div class="table-responsive">
 
                 <table
-                        class="table table-striped snipe-table"
-                        data-toolbar="#toolbar"
+                        data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
+                        data-cookie-id-table="assetsTable"
+                        data-pagination="true"
+                        data-id-table="assetsTable"
+                        data-search="true"
+                        data-side-pagination="server"
+                        data-show-columns="true"
                         data-show-export="true"
                         data-show-refresh="true"
-                        data-export-options='{
-                           "fileName": "{{ str_slug($asset->asset_tag) }}-assets-export",
-                           "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                         }'
-                        data-search="false"
+                        data-sort-order="asc"
+                        id="assetsListingTable"
+                        class="table table-striped snipe-table"
                         data-url="{{route('api.assets.index',['assigned_to' => $asset->id, 'assigned_type' => 'App\Models\Asset']) }}"
-                        data-show-footer="true"
-                        data-cookie-id-table="assetAssetsTable"
-                        data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}">
+                        data-export-options='{
+                              "fileName": "export-assets-{{ str_slug($asset->name) }}-assets-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+
                 </table>
 
 
diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php
index 331c9ee8a..b0e08d074 100644
--- a/resources/views/statuslabels/view.blade.php
+++ b/resources/views/statuslabels/view.blade.php
@@ -46,7 +46,7 @@
                                         class="table table-striped snipe-table"
                                         data-url="{{route('api.assets.index', ['status_id' => $statuslabel->id]) }}"
                                         data-export-options='{
-                              "fileName": "export-locations-{{ str_slug($statuslabel->name) }}-assets-{{ date('Y-m-d') }}",
+                              "fileName": "export-assets-{{ str_slug($statuslabel->name) }}-assets-{{ date('Y-m-d') }}",
                               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                               }'>
                                 </table>