diff --git a/cycle_routes.json b/cycle_routes.json
index 828dfaf..2541cec 100644
--- a/cycle_routes.json
+++ b/cycle_routes.json
@@ -9,25 +9,25 @@
         "pt-br": "Ciclorrotas"
     },
     "query": {
-        "6": "relation[type=route][route=bicycle][network~'^(icn)$']",
-        "9": "relation[type=route][route=bicycle][network~'^(icn|ncn)$']",
-        "12": "relation[type=route][route=bicycle][network~'^(icn|ncn|rcn)$']",
-        "15": "relation[type=route][route=bicycle]"
+        "6": null,
+        "9": null,
+        "12": "way[smoothness=excellent]",
+        "15": "way[smoothness=excellent]"
     },
     "members": true,
     "feature": {
-        "priority": "{{ const[tags.network].priority|default(4) }}",
+        "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}",
         "description": "{{ tagTrans('network', tags.network) }}",
+        "markerSymbol": "",
         "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network].color|default(const[''].color) })|raw }}",
-        "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}",
+        "priority": "{{ const[tags.network].priority|default(4) }}",
         "styles": "",
         "style:hover": {
-            "width": 0
+            "width": "0"
         },
         "style:selected": {
-            "width": 0
-        },
-        "markerSymbol": ""
+            "width": "0"
+        }
     },
     "memberFeature": {
         "pre": [
@@ -72,13 +72,13 @@
         "listExclude": "1",
         "styles": "default{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}",
         "style": {
-            "color": "{{ const[network].color }}",
             "width": "4",
+            "color": "{{ const[network].color }}",
+            "opacity": "1",
+            "lineCap": "{% if not dirForward or not dirBackward %}butt{% else %}round{% endif %}",
             "dashArray": "{% if not dirForward or not dirBackward %}27,8{% endif %}",
             "dashOffset": "{% if dirBackward %}28{% else %}0{% endif %}",
-            "lineCap": "{% if not dirForward or not dirBackward %}butt{% else %}round{% endif %}",
             "noClip": "{% if not dirForward or not dirBackward %}true{% else %}false{% endif %}",
-            "opacity": 1,
             "text": "{{ refs|join(' · ') }}             ",
             "textRepeat": "1",
             "textOffset": "12",
@@ -94,13 +94,13 @@
             "pattern-path-color": "{{ const[network].color }}"
         },
         "style:hover": {
-            "pane": "hover",
             "width": "4",
+            "color": "black",
+            "lineCap": "{% if hover == 'forward' or hover == 'backward' %}butt{% else %}round{% endif %}",
             "dashArray": "{% if hover == 'forward' or hover == 'backward' %}27,8{% endif %}",
             "dashOffset": "{% if hover == 'backward' %}28{% else %}0{% endif %}",
-            "lineCap": "{% if hover == 'forward' or hover == 'backward' %}butt{% else %}round{% endif %}",
             "noClip": "{% if hover == 'forward' or hover == 'backward' %}true{% else %}false{% endif %}",
-            "color": "black",
+            "pane": "hover",
             "pattern": "{% if hover == 'forward' or hover == 'backward' %}arrowHead{% endif %}",
             "pattern-pixelSize": "9",
             "pattern-repeat": "35",
@@ -112,13 +112,13 @@
             "pattern-path-color": "black"
         },
         "style:selected": {
-            "pane": "selected",
             "width": "4",
+            "color": "#3f3f3f",
+            "lineCap": "{% if selected == 'forward' or selected == 'backward' %}butt{% else %}round{% endif %}",
             "dashArray": "{% if selected == 'forward' or selected == 'backward' %}27,8{% endif %}",
             "dashOffset": "{% if selected == 'backward' %}28{% else %}0{% endif %}",
-            "lineCap": "{% if selected == 'forward' or selected == 'backward' %}butt{% else %}round{% endif %}",
             "noClip": "{% if selected == 'forward' or selected == 'backward' %}true{% else %}false{% endif %}",
-            "color": "#3f3f3f",
+            "pane": "selected",
             "pattern": "{% if selected == 'forward' or selected == 'backward' %}arrowHead{% endif %}",
             "pattern-pixelSize": "9",
             "pattern-repeat": "35",