diff --git a/equipment.php b/equipment.php
index 99b2cd3..05cc91b 100644
--- a/equipment.php
+++ b/equipment.php
@@ -96,7 +96,7 @@ template_header('Asset', 'asset', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$view_asset_h2.' - '.$_GET['equipmentID'].'</h2>
-        <a href="index.php?page=equipments" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page='.$_SESSION['origin'].$_SESSION['p'].$_SESSION['status'].$_SESSION['sort'].$_SESSION['search'].$_SESSION['firmware'].$_SESSION['servicedate'].$_SESSION['warrantydate'].$_SESSION['partnerid'].'" class="btn alt mar-right-2">'.$button_cancel.'</a>
 ';
 
 //------------------------------------
diff --git a/equipments.php b/equipments.php
index 2af667a..0fb0fcc 100644
--- a/equipments.php
+++ b/equipments.php
@@ -9,7 +9,9 @@ if (debug && debug_id == $_SESSION['id']){
 include_once './assets/functions.php';
 include_once './settings/settings.php';
 
-$page = 'equipments';
+//SET PAGE ORIGIN FOR NAVIGATION AND SECURITY
+$page = $_SESSION['origin'] = 'equipments';
+
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
     header('location: index.php');
@@ -21,15 +23,17 @@ $update_allowed = isAllowed($page_manage ,$_SESSION['profile'],$_SESSION['permis
 $delete_allowed = isAllowed($page_manage ,$_SESSION['profile'],$_SESSION['permission'],'D');
 $create_allowed = isAllowed($page_manage ,$_SESSION['profile'],$_SESSION['permission'],'C');
 
-//GET PARAMETERS
-$pagination_page = isset($_GET['p']) ? $_GET['p'] : 1;
-$status = isset($_GET['status']) ? '&status='.$_GET['status'] : '';
-$sort = isset($_GET['sort']) ? '&sort='.$_GET['sort'] : '';
-$search = isset($_GET['search']) ? '&search='.$_GET['search'] : '';
-$software = isset($_GET['firmware']) ? '&firmware='.$_GET['firmware'] : '';
-$servicedate = isset($_GET['servicedate']) ? '&servicedate='.$_GET['servicedate'] : '';
-$warrantydate = isset($_GET['warrantydate']) ? '&warrantydate='.$_GET['warrantydate'] : '';
-$partnerid = isset($_GET['partnerid']) ? '&partnerid='.$_GET['partnerid'] : '';
+//GET PARAMETERS && STORE in SESSION for FURTHER USE/NAVIGATION
+$pagination_page = $_SESSION['p'] = isset($_GET['p']) ? $_GET['p'] : 1;
+$status = $_SESSION['status'] = isset($_GET['status']) ? '&status='.$_GET['status'] : '';
+$sort = $_SESSION['sort'] = isset($_GET['sort']) ? '&sort='.$_GET['sort'] : '';
+$search = $_SESSION['search'] = isset($_GET['search']) ? '&search='.$_GET['search'] : '';
+$software = $_SESSION['firmware'] = isset($_GET['firmware']) ? '&firmware='.$_GET['firmware'] : '';
+$servicedate = $_SESSION['servicedate'] = isset($_GET['servicedate']) ? '&servicedate='.$_GET['servicedate'] : '';
+$warrantydate = $_SESSION['warrantydate'] = isset($_GET['warrantydate']) ? '&warrantydate='.$_GET['warrantydate'] : '';
+$partnerid = $_SESSION['partnerid'] = isset($_GET['partnerid']) ? '&partnerid='.$_GET['partnerid'] : '';
+
+
 
 //GET PARAMETERS FOR FILTERS
 $filter = urlGETdetailsFilter($_GET) ?? '';