Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6196)
+++ /trunk/data/defaultpresets.xml	(revision 6197)
@@ -6574,6 +6574,6 @@
                 <role key="across" text="ways supported by (on top of) the bridge" requisite="optional" type="way" />
                 <role key="under" text="ways passing under the bridge" requisite="optional" type="way" />
-                <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway" />
-                <role key="edge" text="nodes forming the outline" requisite="optional" type="node" />
+                <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
+                <role key="edge" text="edge ways parallel to 'across'" requisite="optional" type="way" />
             </roles>
         </item>
@@ -6589,6 +6589,6 @@
             <roles>
                 <role key="through" text="ways passing through the tunnel" requisite="required" type="way" />
-                <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway" />
-                <role key="edge" text="nodes forming the outline" requisite="optional" type="node" />
+                <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
+                <role key="edge" text="edge ways parallel to 'through'" requisite="optional" type="way" />
             </roles>
         </item>