diff --git a/admin/database_updates.php b/admin/database_updates.php
index a8e044d0..f1e138af 100644
--- a/admin/database_updates.php
+++ b/admin/database_updates.php
@@ -4033,10 +4033,92 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.6'");
     }
 
-    // if (CURRENT_DATABASE_VERSION == '2.3.5') {
-    //     // Insert queries here required to update to DB version 2.3.5
+    if (CURRENT_DATABASE_VERSION == '2.3.6') {
+        // Create New Contract Templates Table
+        mysqli_query($mysqli, "CREATE TABLE `contract_templates` (
+          `contract_template_id` INT(11) AUTO_INCREMENT PRIMARY KEY,
+          `contract_template_name` VARCHAR(255) NOT NULL,
+          `contract_template_description` TEXT NULL DEFAULT NULL,
+          `contract_template_type` VARCHAR(50) NULL DEFAULT NULL,
+
+          `contract_template_sla_low_response_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_low_resolution_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_medium_response_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_medium_resolution_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_high_response_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_high_resolution_time` INT(11) NULL DEFAULT NULL,
+
+          `contract_template_rate_standard` DECIMAL(10,2) NULL DEFAULT NULL,
+          `contract_template_rate_after_hours` DECIMAL(10,2) NULL DEFAULT NULL,
+
+          `contract_template_net_terms` VARCHAR(50) NULL DEFAULT NULL,
+          `contract_template_support_hours` VARCHAR(100) NULL DEFAULT NULL,
+          `contract_template_renewal_frequency` VARCHAR(50) NULL DEFAULT NULL,
+
+          `contract_template_details` TEXT NULL DEFAULT NULL,
+
+          `contract_template_created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+          `contract_template_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP,
+          `contract_template_archived_at` DATETIME NULL DEFAULT NULL,
+
+          `company_id` INT(11) NOT NULL
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
+
+
+        // Create New Contracts Table
+        mysqli_query($mysqli, "CREATE TABLE `contracts` (
+            `contract_id` INT(11) AUTO_INCREMENT PRIMARY KEY,
+            `contract_name` VARCHAR(255) NOT NULL,
+            `contract_status` VARCHAR(50) NOT NULL,
+            `contract_type` VARCHAR(50) NOT NULL,
+
+            `contract_sla_low_response_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_low_resolution_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_medium_response_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_medium_resolution_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_high_response_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_high_resolution_time` INT(11) NULL DEFAULT NULL,
+
+            `contract_details` TEXT NULL DEFAULT NULL,
+
+            `contract_client_id` INT(11) NULL DEFAULT NULL,
+            `contract_client_name` VARCHAR(255) NULL DEFAULT NULL,
+            `contract_client_address` TEXT NULL DEFAULT NULL,
+            `contract_client_email` VARCHAR(255) NULL DEFAULT NULL,
+            `contract_client_phone` VARCHAR(100) NULL DEFAULT NULL,
+
+            `contract_contact_name` VARCHAR(255) NULL DEFAULT NULL,
+            `contract_contact_signature` TEXT NULL DEFAULT NULL,
+            `contract_contact_signature_date` DATETIME NULL DEFAULT NULL,
+
+            `contract_agent_name` VARCHAR(255) NULL DEFAULT NULL,
+            `contract_agent_signature` TEXT NULL DEFAULT NULL,
+            `contract_agent_signature_date` DATETIME NULL DEFAULT NULL,
+
+            `contract_rate_standard` DECIMAL(10,2) NULL DEFAULT NULL,
+            `contract_rate_after_hours` DECIMAL(10,2) NULL DEFAULT NULL,
+
+            `contract_net_terms` VARCHAR(50) NULL DEFAULT NULL,
+            `contract_support_hours` VARCHAR(100) NULL DEFAULT NULL,
+
+            `contract_start_date` DATE NULL DEFAULT NULL,
+            `contract_end_date` DATE NULL DEFAULT NULL,
+            `contract_renewal_frequency` VARCHAR(50) NULL DEFAULT NULL,
+
+            `contract_created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+            `contract_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP,
+            `contract_archived_at` DATETIME NULL DEFAULT NULL,
+
+            FOREIGN KEY (`contract_client_id`) REFERENCES `clients`(`client_id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
+        
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.7'");
+    }
+
+    // if (CURRENT_DATABASE_VERSION == '2.3.7') {
+    //     // Insert queries here required to update to DB version 2.3.8
     //     // Then, update the database to the next sequential version
-    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.6'");
+    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.8'");
     // }
 
 } else {
diff --git a/agent/global_search.php b/agent/global_search.php
index 47c863d5..8a3f0f42 100644
--- a/agent/global_search.php
+++ b/agent/global_search.php
@@ -518,10 +518,10 @@ if (isset($_GET['query'])) {
 
                                 ?>
                                 <tr>
-                                    <td><a href="ticket.php?ticket_id=<?php echo $ticket_id ?>"><?php echo $ticket_prefix . $ticket_number; ?></a></td>
-                                    <td><?php echo $ticket_subject; ?></td>
-                                    <td><?php echo $ticket_status_name; ?></td>
-                                    <td><a href="tickets.php?client_id=<?php echo $client_id ?>"><?php echo $client_name; ?></a></td>
+                                    <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>"><?= $ticket_prefix . $ticket_number ?></a></td>
+                                    <td><?= $ticket_subject ?></td>
+                                    <td><?= $ticket_status_name ?></td>
+                                    <td><a href="tickets.php?client_id=<?= $client_id ?>"><?= $client_name ?></a></td>
                                 </tr>
 
                             <?php } ?>
@@ -867,7 +867,7 @@ if (isset($_GET['query'])) {
                                         <?php echo "$client_name - $ticket_prefix$ticket_number - $ticket_subject"; ?>
                                     </h3>
                                     <div class="card-tools">
-                                        <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>" target="_blank">Open <i class="fa fa-fw fa-external-link-alt"></i></a>
+                                        <a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>" target="_blank">Open <i class="fa fa-fw fa-external-link-alt"></i></a>
                                     </div>
                                 </div>
                                 <div class="card-body prettyContent">
diff --git a/db.sql b/db.sql
index dad15b41..6a1fddf5 100644
--- a/db.sql
+++ b/db.sql
@@ -773,6 +773,84 @@ CREATE TABLE `contacts` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `contract_templates`
+--
+
+DROP TABLE IF EXISTS `contract_templates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `contract_templates` (
+  `contract_template_id` int(11) NOT NULL AUTO_INCREMENT,
+  `contract_template_name` varchar(255) NOT NULL,
+  `contract_template_description` text DEFAULT NULL,
+  `contract_template_type` varchar(50) DEFAULT NULL,
+  `contract_template_sla_low_response_time` int(11) DEFAULT NULL,
+  `contract_template_sla_low_resolution_time` int(11) DEFAULT NULL,
+  `contract_template_sla_medium_response_time` int(11) DEFAULT NULL,
+  `contract_template_sla_medium_resolution_time` int(11) DEFAULT NULL,
+  `contract_template_sla_high_response_time` int(11) DEFAULT NULL,
+  `contract_template_sla_high_resolution_time` int(11) DEFAULT NULL,
+  `contract_template_rate_standard` decimal(10,2) DEFAULT NULL,
+  `contract_template_rate_after_hours` decimal(10,2) DEFAULT NULL,
+  `contract_template_net_terms` varchar(50) DEFAULT NULL,
+  `contract_template_support_hours` varchar(100) DEFAULT NULL,
+  `contract_template_renewal_frequency` varchar(50) DEFAULT NULL,
+  `contract_template_details` text DEFAULT NULL,
+  `contract_template_created_at` datetime DEFAULT current_timestamp(),
+  `contract_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
+  `contract_template_archived_at` datetime DEFAULT NULL,
+  `company_id` int(11) NOT NULL,
+  PRIMARY KEY (`contract_template_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `contracts`
+--
+
+DROP TABLE IF EXISTS `contracts`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `contracts` (
+  `contract_id` int(11) NOT NULL AUTO_INCREMENT,
+  `contract_name` varchar(255) NOT NULL,
+  `contract_status` varchar(50) NOT NULL,
+  `contract_type` varchar(50) NOT NULL,
+  `contract_sla_low_response_time` int(11) DEFAULT NULL,
+  `contract_sla_low_resolution_time` int(11) DEFAULT NULL,
+  `contract_sla_medium_response_time` int(11) DEFAULT NULL,
+  `contract_sla_medium_resolution_time` int(11) DEFAULT NULL,
+  `contract_sla_high_response_time` int(11) DEFAULT NULL,
+  `contract_sla_high_resolution_time` int(11) DEFAULT NULL,
+  `contract_details` text DEFAULT NULL,
+  `contract_client_id` int(11) DEFAULT NULL,
+  `contract_client_name` varchar(255) DEFAULT NULL,
+  `contract_client_address` text DEFAULT NULL,
+  `contract_client_email` varchar(255) DEFAULT NULL,
+  `contract_client_phone` varchar(100) DEFAULT NULL,
+  `contract_contact_name` varchar(255) DEFAULT NULL,
+  `contract_contact_signature` text DEFAULT NULL,
+  `contract_contact_signature_date` datetime DEFAULT NULL,
+  `contract_agent_name` varchar(255) DEFAULT NULL,
+  `contract_agent_signature` text DEFAULT NULL,
+  `contract_agent_signature_date` datetime DEFAULT NULL,
+  `contract_rate_standard` decimal(10,2) DEFAULT NULL,
+  `contract_rate_after_hours` decimal(10,2) DEFAULT NULL,
+  `contract_net_terms` varchar(50) DEFAULT NULL,
+  `contract_support_hours` varchar(100) DEFAULT NULL,
+  `contract_start_date` date DEFAULT NULL,
+  `contract_end_date` date DEFAULT NULL,
+  `contract_renewal_frequency` varchar(50) DEFAULT NULL,
+  `contract_created_at` datetime DEFAULT current_timestamp(),
+  `contract_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
+  `contract_archived_at` datetime DEFAULT NULL,
+  PRIMARY KEY (`contract_id`),
+  KEY `contract_client_id` (`contract_client_id`),
+  CONSTRAINT `contracts_ibfk_1` FOREIGN KEY (`contract_client_id`) REFERENCES `clients` (`client_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `credential_tags`
 --
@@ -2819,4 +2897,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-10-02 14:27:24
+-- Dump completed on 2025-11-07 16:47:40
diff --git a/includes/database_version.php b/includes/database_version.php
index a2c67fc8..550ddbd1 100644
--- a/includes/database_version.php
+++ b/includes/database_version.php
@@ -5,4 +5,4 @@
  * It is used in conjunction with database_updates.php
  */
 
-DEFINE("LATEST_DATABASE_VERSION", "2.3.6");
+DEFINE("LATEST_DATABASE_VERSION", "2.3.7");