diff --git a/application/controllers/Stationsetup.php b/application/controllers/Stationsetup.php
index 996ad8511..aa0e7f418 100644
--- a/application/controllers/Stationsetup.php
+++ b/application/controllers/Stationsetup.php
@@ -362,7 +362,7 @@ class Stationsetup extends CI_Controller {
 
 	private function stationlinked2html($linked) {
 		if ($linked == 1) {
-			return '<i class="fa fa-check text-success" aria-hidden="true"></i>';
+			return '<i class="fa fa-check text-success" aria-hidden="true"></i><span class="d-none">yes</span>';
 		}
 		return '<i class="fa fa-times text-danger" aria-hidden="true"></i>';
 	}
diff --git a/application/views/stationsetup/stationsetup.php b/application/views/stationsetup/stationsetup.php
index f2920d817..c1bdfeb51 100644
--- a/application/views/stationsetup/stationsetup.php
+++ b/application/views/stationsetup/stationsetup.php
@@ -101,7 +101,7 @@
 					<?= __("The 'Linked' column shows if the station location is linked with the Active Logbook selected above."); ?>
 				</p>
 
-						<p><a href="<?php echo site_url('station/create'); ?>" class="btn btn-sm btn-primary"><i class="fas fa-plus"></i> <?= __("Create a Station Location"); ?></a></p>
+						<p><a href="<?php echo site_url('station/create'); ?>" class="btn btn-sm btn-primary"><i class="fas fa-plus"></i> <?= __("Create a Station Location"); ?></a> <button onclick="filterlocations();" class="btn btn-sm btn-success"><?= __("Show only locations from the active logbook"); ?></button> <button onclick="removefilterlocations();" class="btn btn-sm btn-success"><?= __("Show all locations"); ?></button></p>
 
 <?php if($current_active == 0) { ?>
 <div class="alert alert-danger" role="alert">
diff --git a/assets/js/sections/stationsetup.js b/assets/js/sections/stationsetup.js
index 7b65f1cab..ec6eedc1b 100644
--- a/assets/js/sections/stationsetup.js
+++ b/assets/js/sections/stationsetup.js
@@ -555,7 +555,7 @@ function loadLocationTable(rows) {
 			},
 			'columnDefs': [
 				{ 'targets':0,
-				  'createdCell':  function (td, cellData, rowData, row, col) {
+					'createdCell':  function (td, cellData, rowData, row, col) {
 				  			(td).attr('data-order', 1);	// not sure how to add ID dynamic here
 					}
 				},
@@ -594,10 +594,24 @@ function loadLocationTable(rows) {
 
 		let createdRow = table.row.add(data).index();
 	}
+	// Clear filters from previous session
+	table.search('');
+	table.columns().search('');
+	table.state.clear();  // Optional: clear all saved state
 	table.draw();
 	$('[data-bs-toggle="tooltip"]').tooltip();
 }
 
+function filterlocations() {
+	var table = $('#station_locations_table').DataTable();
+	table.column(7).search('yes').draw();
+}
+
+function removefilterlocations() {
+	var table = $('#station_locations_table').DataTable();
+	table.column(7).search('').draw();
+}
+
 function linkLocations() {
 	$('.linkLocationButton').prop("disabled", true);
 	var locationid = $('#StationLocationSelect').val();