diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bikeway/AddCycleway.java b/app/src/main/java/de/westnordost/streetcomplete/quests/bikeway/AddCycleway.java
index 41c0548e61..dfe3b1c92c 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bikeway/AddCycleway.java
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bikeway/AddCycleway.java
@@ -186,13 +186,13 @@ private static String getOverpassQuery(BoundingBox bbox)
 	{
 		int d = MIN_DIST_TO_CYCLEWAYS;
 		return OverpassQLUtil.getGlobalOverpassBBox(bbox) +
-			"way[highway ~ \"^(primary|secondary|tertiary|unclassified|residential)$\"]" +
+			"way[highway ~ \"^(primary|secondary|tertiary|unclassified)$\"]" +
 			   "[area != yes]" +
 				// only without cycleway tags
 			   "[!cycleway][!\"cycleway:left\"][!\"cycleway:right\"][!\"cycleway:both\"]" +
 			   "[!\"sidewalk:bicycle\"][!\"sidewalk:both:bicycle\"][!\"sidewalk:left:bicycle\"][!\"sidewalk:right:bicycle\"]" +
 			   // not any with low speed limit because they not very likely to have cycleway infrastructure
-			   "[maxspeed !~ \"^(30|25|20|15|10|8|7|6|5|20 mph|15 mph|10 mph|5 mph|walk)$\"]" +
+			   "[maxspeed !~ \"^(20|15|10|8|7|6|5|10 mph|5 mph|walk)$\"]" +
 			   // not any unpaved because of the same reason
 			   "[surface !~ \"^("+ TextUtils.join("|", OsmTaggings.ANYTHING_UNPAVED)+")$\"]" +
 			   // not any explicitly tagged as no bicycles