diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
index 105edfd..318389a 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
@@ -6502,7 +6502,9 @@ function applyMapFilter() {
     const sourceVisible = noneSelected
       ? DEFAULT_MAP_SOURCE_FILTER[type] !== undefined ? DEFAULT_MAP_SOURCE_FILTER[type] : true
       : !!mapFilter[type];
-    const rigVisible = true;
+    const rigVisible = !mapRigFilter
+      || marker.__trxType === "bookmark"
+      || (marker.__trxRigIds instanceof Set && marker.__trxRigIds.has(mapRigFilter));
     const visible = marker.__trxHistoryVisible !== false
       && markerPassesSearchFilter(marker)
       && markerPassesLocatorFilters(marker)
diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
index bb9765b..8f6f489 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
@@ -773,6 +773,12 @@
             <span class="map-locator-filter-label" id="map-locator-choice-label">Show</span>
             <div id="map-locator-choice-filter" class="map-locator-chip-row"></div>
           </div>
+          <div class="map-locator-filter-group">
+            <span class="map-locator-filter-label">Rig</span>
+            <select id="map-rig-filter" class="map-history-select" aria-label="Filter by rig">
+              <option value="">All</option>
+            </select>
+          </div>
           <div class="map-locator-filter-group">
             <span class="map-locator-filter-label">Search</span>
             <input type="text" id="map-search-filter" class="map-search-input" placeholder="Callsign, MMSI, locator, message..." />