diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index cef8506d7..d03ee5ea4 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -210,7 +210,7 @@ class ComponentsController extends Controller
             $component->assets()->attach($component->id, [
                 'component_id' => $component->id,
                 'created_at' => \Carbon::now(),
-                'assigned_qty' => $request->get('assigned_qty'),
+                'assigned_qty' => $request->get('assigned_qty', 1),
                 'user_id' => \Auth::id(),
                 'asset_id' => $request->get('assigned_to')
             ]);
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 3b9dfb4f5..c4d06ada2 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -991,7 +991,8 @@
                            "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                          }'
                                         data-url="{{ route('api.maintenances.index', array('asset_id' => $asset->id)) }}"
-                                        data-cookie-id-table="assetMaintenancesTable">
+                                        data-cookie-id-table="assetMaintenancesTable"
+                                        data-cookie="true">
                                 </table>
                             </div> <!-- /.col-md-12 -->
                         </div> <!-- /.row -->
@@ -1019,7 +1020,8 @@
                        }'
 
                       data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
-                      data-cookie-id-table="assetHistory">
+                      data-cookie-id-table="assetHistory"
+                      data-cookie="true">
                 <thead>
                 <tr>
                   <th data-visible="true" style="width: 40px;" class="hidden-xs">Icon</th>
diff --git a/routes/api.php b/routes/api.php
index 51bd4614d..4fb252aaa 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -197,21 +197,6 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api']
 
     /*--- Components API ---*/
 
-    Route::resource('components', 'ComponentsController',
-        [
-            'names' =>
-                [
-                    'index' => 'api.components.index',
-                    'show' => 'api.components.show',
-                    'store' => 'api.components.store',
-                    'update' => 'api.components.update',
-                    'destroy' => 'api.components.destroy'
-                ],
-            'except' => ['create', 'edit'],
-            'parameters' => ['component' => 'component_id']
-        ]
-    ); // Components resource
-
     Route::group(['prefix' => 'components'], function () {
 
         Route::get('{component}/assets',
@@ -236,6 +221,24 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api']
     );
 
     }); // Components group
+    
+
+    Route::resource('components', 'ComponentsController',
+        [
+            'names' =>
+                [
+                    'index' => 'api.components.index',
+                    'show' => 'api.components.show',
+                    'store' => 'api.components.store',
+                    'update' => 'api.components.update',
+                    'destroy' => 'api.components.destroy'
+                ],
+            'except' => ['create', 'edit'],
+            'parameters' => ['component' => 'component_id']
+        ]
+    ); // Components resource
+
+   
 
 
     /*--- Consumables API ---*/