diff --git a/database/setup.sh b/database/setup.sh
index 8839190..5bcaff1 100644
--- a/database/setup.sh
+++ b/database/setup.sh
@@ -71,7 +71,12 @@ SELECT
 FROM planet_osm_line p
 WHERE p.highway IN ('residential', 'primary', 'secondary', 'tertiary')
   AND p.highway != 'living_street'
-  AND NOT ((p.tags->'maxspeed') IN ('30', 'DE:zone:30'));
+  AND NOT COALESCE(
+      ((p.tags->'maxspeed') ~ '^\d+$' AND (p.tags->'maxspeed')::integer <= 30)
+      OR (p.tags->'maxspeed') IN ('DE:zone:30', 'DE:zone:20', 'DE:zone:10')
+      OR (p.tags->'maxspeed') = 'walk',
+      false
+  );
 "
 
 # Create spatial index
diff --git a/proxy/proxy.js b/proxy/proxy.js
index 413f995..372ad38 100644
--- a/proxy/proxy.js
+++ b/proxy/proxy.js
@@ -55,9 +55,9 @@ app.get('/tempo30-wfs', async (req, res) => {
     }
 });
 
-// Forwarding of planet_osm_roads feature layer
+// Forwarding of relevant_roads feature layer (analyzed roads without existing tempo 30)
 app.get('/roads-wfs', async (req, res) => {
-    const layerName = 'planet_osm_roads';
+    const layerName = 'relevant_roads';
     try {
         const data = await fetchWfs(layerName);
         res.setHeader('Content-Type', OUTPUT_FORMAT);