diff --git a/configs/tegola.toml b/configs/tegola.toml
index fbf255d..7ccd368 100644
--- a/configs/tegola.toml
+++ b/configs/tegola.toml
@@ -73,21 +73,21 @@ srid = 4326             # The default srid for this provider. If not provided it
   geometry_fieldname = "location"
   geometry_type="point"
   id_fieldname = "id"
-  sql = "SELECT address, created, id, ST_AsMVTGeom(location::geometry, !BBOX!) AS location, public_id, status, table_name FROM publicreport.report_location WHERE location && !BBOX!"
+  sql = "SELECT address_raw, created, id, ST_AsMVTGeom(location, !BBOX!) AS location, public_id, status, table_name FROM publicreport.report_location WHERE location && !BBOX!"
 
   [[providers.layers]]
   name = "nuisance_location"
   geometry_fieldname = "location"
   geometry_type="point"
   id_fieldname = "id"
-  sql = "SELECT address, created, id, ST_AsMVTGeom(location::geometry, !BBOX!) AS location, public_id, status FROM publicreport.report_location WHERE table_name = 'nuisance' AND location && !BBOX!"
+  sql = "SELECT address_raw, created, id, ST_AsMVTGeom(location, !BBOX!) AS location, public_id, status FROM publicreport.report_location WHERE table_name = 'nuisance' AND location && !BBOX!"
 
   [[providers.layers]]
-  name = "pool_location"
+  name = "water_location"
   geometry_fieldname = "location"
   geometry_type="point"
   id_fieldname = "id"
-  sql = "SELECT address, created, id, ST_AsMVTGeom(location::geometry, !BBOX!) AS location, public_id, status FROM publicreport.report_location WHERE table_name = 'pool' AND location && !BBOX!"
+  sql = "SELECT address_raw, created, id, ST_AsMVTGeom(location, !BBOX!) AS location, public_id, status FROM publicreport.report_location WHERE table_name = 'water' AND location && !BBOX!"
 
 [[maps]]
 name = "rmo"
@@ -99,7 +99,7 @@ center = [-119.175, 36.24, 11.0]
   #max_zoom = 20
 
   [[maps.layers]]
-  provider_layer = "rmo.pool_location"
+  provider_layer = "rmo.water_location"
   #min_zoom = 5
   #max_zoom = 20
 
diff --git a/flake.lock b/flake.lock
index 744b5fd..6129492 100644
--- a/flake.lock
+++ b/flake.lock
@@ -316,17 +316,17 @@
         "proj": "proj"
       },
       "locked": {
-        "lastModified": 1772850683,
-        "narHash": "sha256-Fcirvq8hBzkJo3XxEFKIwYWMpY7O0LVaU0WcbYR9j9A=",
+        "lastModified": 1773244212,
+        "narHash": "sha256-FGR1UOfgsYXsurRSzSNkiLzvW+s+ck3LmLbcLfGr5OE=",
         "owner": "Gleipnir-Technology",
         "repo": "nidus-sync",
-        "rev": "4972dd05ee29181cfea2b9a2608f12b0f9ad0726",
+        "rev": "edcb48f84f49d44bbff3e1bb83c4182db932f4e7",
         "type": "github"
       },
       "original": {
         "owner": "Gleipnir-Technology",
         "repo": "nidus-sync",
-        "rev": "4972dd05ee29181cfea2b9a2608f12b0f9ad0726",
+        "rev": "edcb48f84f49d44bbff3e1bb83c4182db932f4e7",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index e5412e1..5b04b2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,7 @@
 			type = "github";
 			owner = "Gleipnir-Technology";
 			repo = "nidus-sync";
-			rev = "4972dd05ee29181cfea2b9a2608f12b0f9ad0726";
+			rev = "edcb48f84f49d44bbff3e1bb83c4182db932f4e7";
 		};
 		nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
 		nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";