--- a/schema/default_sysconfig.sql	Tue Oct 15 15:55:12 2019 +0200
+++ b/schema/default_sysconfig.sql	Tue Oct 15 15:59:38 2019 +0200
@@ -88,14 +88,16 @@
             ON fca.location = g.location AND fca.date_issue >= wl.date_issue
     $$);
 
-INSERT INTO sys_admin.published_services (schema, name, srid, view_def) VALUES
+INSERT INTO sys_admin.published_services (
+    schema, name, srid, key_column, view_def
+) VALUES
     -- Directly accessed tables
-    ('waterway', 'waterway_axis', NULL, NULL),
-    ('waterway', 'waterway_area', NULL, NULL),
-    ('waterway', 'waterway_profiles', NULL, NULL),
-    ('waterway', 'fairway_dimensions', NULL, NULL),
+    ('waterway', 'waterway_axis', NULL, NULL, NULL),
+    ('waterway', 'waterway_area', NULL, NULL, NULL),
+    ('waterway', 'waterway_profiles', NULL, NULL, NULL),
+    ('waterway', 'fairway_dimensions', NULL, NULL, NULL),
     -- GeoServer SQL views
-    ('waterway', 'gauges_geoserver', 4326, $$
+    ('waterway', 'gauges_geoserver', 4326, 'isrs_code', $$
         SELECT
             isrs_code,
             objname,
@@ -117,7 +119,7 @@
         ) AS gauges_base_view
         WHERE NOT erased
     $$),
-    ('waterway', 'sections_geoserver', 4326, $$
+    ('waterway', 'sections_geoserver', 4326, 'id', $$
         SELECT
             s.id,
             s.name,
@@ -140,7 +142,7 @@
                 ON g.location <@ s.section
         GROUP BY s.id
     $$),
-    ('waterway', 'stretches_geoserver', 4326, $$
+    ('waterway', 'stretches_geoserver', 4326, 'id', $$
         SELECT
             s.id,
             s.name,
@@ -166,7 +168,7 @@
                 ON g.location <@ s.stretch
         GROUP BY s.id
     $$),
-    ('waterway', 'distance_marks_ashore_geoserver', 4326, $$
+    ('waterway', 'distance_marks_ashore_geoserver', 4326, 'id', $$
         SELECT id,
            country,
            geom,
@@ -176,7 +178,7 @@
            position_code
         FROM waterway.distance_marks
     $$),
-    ('waterway', 'distance_marks_geoserver', 4326, $$
+    ('waterway', 'distance_marks_geoserver', 4326, 'location', $$
         SELECT
            isrs_asText(location_code) AS location,
            geom,
@@ -184,7 +186,7 @@
            (location_code).hectometre
         FROM waterway.distance_marks_virtual
     $$),
-    ('waterway', 'sounding_results_areas_geoserver', 4326, $$
+    ('waterway', 'sounding_results_areas_geoserver', 4326, NULL, $$
         SELECT bottleneck_id,
             date_info,
             height,
@@ -192,7 +194,7 @@
         FROM waterway.sounding_results_iso_areas ia
             JOIN waterway.sounding_results sr ON sr.id = ia.sounding_result_id
     $$),
-    ('waterway', 'bottlenecks_geoserver', 4326, $$
+    ('waterway', 'bottlenecks_geoserver', 4326, 'id', $$
         SELECT
             b.id,
             b.bottleneck_id,
@@ -235,7 +237,7 @@
                 ON b.bottleneck_id = srl.bottleneck_id
         WHERE b.validity @> current_timestamp
     $$),
-    ('waterway', 'bottleneck_overview', 4326, $$
+    ('waterway', 'bottleneck_overview', 4326, NULL, $$
         SELECT
             objnam AS name,
             ST_Centroid(area) AS point,
@@ -251,7 +253,7 @@
         WHERE bn.validity @> current_timestamp
         ORDER BY objnam
     $$),
-    ('waterway', 'sounding_differences', 4326, $$
+    ('waterway', 'sounding_differences', 4326, NULL, $$
         SELECT
             sd.id           AS id,
             bn.objnam       AS objnam,