Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6392)
+++ trunk/data/defaultpresets.xml	(revision 6393)
@@ -6972,9 +6972,22 @@
         </item>
         <item name="Address Interpolation" icon="presets/interpolation.png" type="way">
-           <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-                 de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+           <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
+                 de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
+                 es.href="http://wiki.openstreetmap.org/wiki/ES:Key:addr"
+                 et.href="http://wiki.openstreetmap.org/wiki/Et:Key:addr"
+                 fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:addr"
+                 hr.href="http://wiki.openstreetmap.org/wiki/Hr:Key:addr"
+                 it.href="http://wiki.openstreetmap.org/wiki/IT:Key:addr"
+                 ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:addr"
+                 nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:addr"
+                 pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:addr"
+                 pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
+                 ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr" />
             <label text="Edit Address Interpolation" />
             <space />
             <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" match="key" />
+            <optional>
+                <combo key="addr:inclusion" text="Accuracy" values="actual,estimate,potential" match="key" />
+            </optional>
         </item>
         <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation">
Index: trunk/data/ignoretags.cfg
===================================================================
--- trunk/data/ignoretags.cfg	(revision 6392)
+++ trunk/data/ignoretags.cfg	(revision 6393)
@@ -53,4 +53,5 @@
 E:opening_hours
 E:maxspeed
+E:colour
 ;
 ; Ignore valid and semi-valid keys that end with...
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java	(revision 6392)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java	(revision 6393)
@@ -333,5 +333,7 @@
     @Override
     public void visit(Way w) {
-        if (w.getNodesCount() > 0) {
+        // Do not consider empty ways and addr:interpolation ways as they are not physical features and most of the time
+        // very near the associated highway, which is perfectly normal, see #9332
+        if (w.getNodesCount() > 0 && !w.hasKey("addr:interpolation")) {
             ways.addAll(getWaySegments(w));
             QuadBuckets<Node> set = endnodes;