diff --git a/html/template/rmo/status.html b/html/template/rmo/status.html
index 988ae9c4..4538a7f3 100644
--- a/html/template/rmo/status.html
+++ b/html/template/rmo/status.html
@@ -10,11 +10,10 @@
 	<script src="/static/js/geocode.js"></script>
 	<script src="/static/js/location.js"></script>
 	<script src="/static/js/map-multipoint.js"></script>
-	<-- ordering matters since report table depends on time-relative !-->
+	<!-- ordering matters since report table depends on time-relative -->
 	<script src="/static/js/time-relative.js"></script>
 	<script src="/static/js/report-table.js"></script>
 <script>
-const MAPBOX_ACCESS_TOKEN = '{{.MapboxToken}}';
 var markers = [];
 // Because features come from tiled vector data, feature geometries may be split
 // or duplicated across tile boundaries. As a result, features may appear
@@ -88,7 +87,7 @@ function onLoad() {
 			}
 		});
 		map.addLayer({
-			'id': 'water',
+			'id': 'rmo_water',
 			'source': 'tegola',
 			'source-layer': 'water_location',
 			'type': 'circle',
@@ -110,7 +109,7 @@ function onLoad() {
 				}
 			}
 			_addCheckboxClick(checkboxNuisance, "nuisance");
-			_addCheckboxClick(checkboxWater, "water");
+			_addCheckboxClick(checkboxWater, "rmo_water");
 			checkboxNuisance.onclick()
 			checkboxWater.onclick()
 		});
@@ -185,7 +184,6 @@ document.addEventListener('DOMContentLoaded', onLoad);
 				<form class="row g-3 align-items-center" action="#" id="lookup-form">
 					<div class="col-md-9">
 						<address-or-report-input
-							api-key="{{ .MapboxToken }}"
 							name="address-or-report"
 							placeholder="Enter a report ID, address, neighborhood, or zip code"
 						></address-or-report-input>