Index: /applications/editors/josm/plugins/DirectUpload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/DirectUpload/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/agpifoj/build.xml
===================================================================
--- /applications/editors/josm/plugins/agpifoj/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/agpifoj/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/cadastre-fr/build.xml
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/colorscheme/build.xml
===================================================================
--- /applications/editors/josm/plugins/colorscheme/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/colorscheme/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/globalsat/build.xml
===================================================================
--- /applications/editors/josm/plugins/globalsat/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/globalsat/build.xml	(revision 14015)
@@ -11,5 +11,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/lakewalker/build.xml
===================================================================
--- /applications/editors/josm/plugins/lakewalker/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/lakewalker/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- /applications/editors/josm/plugins/livegps/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/livegps/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/measurement/build.xml
===================================================================
--- /applications/editors/josm/plugins/measurement/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/measurement/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/nearclick/build.xml
===================================================================
--- /applications/editors/josm/plugins/nearclick/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/nearclick/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- /applications/editors/josm/plugins/openvisible/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/openvisible/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/osmarender/build.xml
===================================================================
--- /applications/editors/josm/plugins/osmarender/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/osmarender/build.xml	(revision 14015)
@@ -12,5 +12,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/plastic_laf/build.xml
===================================================================
--- /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/remotecontrol/build.xml
===================================================================
--- /applications/editors/josm/plugins/remotecontrol/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/remotecontrol/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/slippymap/build.xml
===================================================================
--- /applications/editors/josm/plugins/slippymap/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/slippymap/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/surveyor/build.xml	(revision 14015)
@@ -11,5 +11,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/tcxplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/tcxplugin/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/tcxplugin/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- /applications/editors/josm/plugins/terracer/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/terracer/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/usertools/build.xml
===================================================================
--- /applications/editors/josm/plugins/usertools/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/usertools/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/utilsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: /applications/editors/josm/plugins/validator/build.xml
===================================================================
--- /applications/editors/josm/plugins/validator/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/validator/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="An OSM data validator. It checks for problems in data, and provides fixes for the common ones. Spellcheck integrated for tag names."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Validator"/>
-                <attribute name="Plugin-Mainversion" value="1465"/>
+                <attribute name="Plugin-Mainversion" value="1470"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java	(revision 14014)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java	(revision 14015)
@@ -45,4 +45,7 @@
     public static final String PREF_TESTS_BEFORE_UPLOAD = PREFIX + ".testsBeforeUpload";
 
+    /** The preferences key for ignored severity other on upload */
+    public static final String PREF_OTHER_UPLOAD = PREFIX + ".otherUpload";
+
     /**
      * The preferences key for enabling the permanent filtering
@@ -53,4 +56,5 @@
     private JCheckBox prefUseIgnore;
     private JCheckBox prefUseLayer;
+    private JCheckBox prefOtherUpload;
 
     /** The list of all tests */
@@ -73,4 +77,8 @@
         prefUseLayer.setToolTipText(tr("Use the error layer to display problematic elements."));
         testPanel.add(prefUseLayer, GBC.eol());
+
+        prefOtherUpload = new JCheckBox(tr("Show informational level on upload."), Main.pref.getBoolean(PREF_OTHER_UPLOAD, false));
+        prefOtherUpload.setToolTipText(tr("Show the informational tests in the upload check windows."));
+        testPanel.add(prefOtherUpload, GBC.eol());
 
         GBC a = GBC.eol().insets(-5,0,0,0);
@@ -117,4 +125,5 @@
         Main.pref.put( PREF_TESTS_BEFORE_UPLOAD, testsBeforeUpload.toString());
         Main.pref.put( PREF_USE_IGNORE, prefUseIgnore.isSelected());
+        Main.pref.put( PREF_OTHER_UPLOAD, prefOtherUpload.isSelected());
         Main.pref.put( PREF_LAYER, prefUseLayer.isSelected());
         return false;
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java	(revision 14014)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java	(revision 14015)
@@ -22,5 +22,5 @@
  * validated. These primitives are always visited in the same order: nodes
  * first, then ways.
- * 
+ *
  * @author frsantos
  */
@@ -29,8 +29,8 @@
     /** Name of the test */
     protected String name;
-    
+
     /** Description of the test */
     protected String description;
-    
+
     /** Whether this test is enabled. Enabled by default */
     protected boolean enabled = true;
@@ -41,5 +41,5 @@
     /** The preferences check for validation on upload */
     protected JCheckBox checkBeforeUpload;
-    
+
     /** Whether this test must check before upload. Enabled by default */
     protected boolean testBeforeUpload = true;
@@ -64,5 +64,5 @@
         this.description = description;
     }
-    
+
     /**
      * Constructor
@@ -73,17 +73,17 @@
         this.name = name;
     }
-    
+
     /**
      * Initializes any global data used this tester.
      * @param plugin The plugin
      * @throws Exception When cannot initialize the test
-     */ 
+     */
     public static void initialize(OSMValidatorPlugin plugin) throws Exception {}
-    
+
     /**
      * Notification of the start of the test. The tester can initialize the
      * structures it may need for this test
-     */ 
-    public void startTest() 
+     */
+    public void startTest()
     {
         errors = new ArrayList<TestError>(30);
@@ -93,22 +93,22 @@
      * Flag notifying that this test is run over a partial data selection
      * @param partialSelection Whether the test is on a partial selection data
-     */ 
-    public void setPartialSelection(boolean partialSelection) 
+     */
+    public void setPartialSelection(boolean partialSelection)
     {
         this.partialSelection = partialSelection;
     }
-    
+
     /**
      * Gets the validation errors accumulated until this moment.
-     * @return The list of errors 
-     */
-    public List<TestError> getErrors() 
+     * @return The list of errors
+     */
+    public List<TestError> getErrors()
     {
         return errors;
     }
-    
+
     /**
      * Notification of the end of the test. The tester may perform additional
-     * actions and destroy the used structures 
+     * actions and destroy the used structures
      */
     public void endTest() {}
@@ -117,8 +117,8 @@
      * Visits all primitives to be tested. These primitives are always visited
      * in the same order: nodes first, then ways.
-     * 
+     *
      * @param selection The primitives to be tested
      */
-    public void visit(Collection<OsmPrimitive> selection) 
+    public void visit(Collection<OsmPrimitive> selection)
     {
         for (OsmPrimitive p : selection)
@@ -136,8 +136,8 @@
 
     /**
-     * Allow the tester to manage its own preferences 
+     * Allow the tester to manage its own preferences
      * @param testPanel The panel to add any preferences component
      */
-    public void addGui(JPanel testPanel) 
+    public void addGui(JPanel testPanel)
     {
         checkEnabled = new JCheckBox(name, enabled);
@@ -161,8 +161,8 @@
         return false;
     }
-    
+
     /**
      * Fixes the error with the appropiate command
-     * 
+     *
      * @param testError
      * @return The command to fix the error
@@ -172,8 +172,8 @@
         return null;
     }
-    
+
     /**
      * Returns true if the given error can be fixed automatically
-     * 
+     *
      * @param testError The error to check if can be fixed
      * @return true if the error can be fixed
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java	(revision 14014)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java	(revision 14015)
@@ -60,5 +60,14 @@
             test.visit(selection);
             test.endTest();
-            errors.addAll( test.getErrors() );
+            if(Main.pref.getBoolean(PreferenceEditor.PREF_OTHER_UPLOAD, false))
+                errors.addAll( test.getErrors() );
+            else
+            {
+                for(TestError e : test.getErrors())
+                {
+                    if(e.getSeverity() != Severity.OTHER)
+                        errors.add(e);
+                }
+            }
         }
         tests = null;
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java	(revision 14014)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java	(revision 14015)
@@ -15,4 +15,5 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -255,5 +256,15 @@
         if(presets != null)
         {
+            Way w = new Way();
+            w.checkTagged();
+            w.checkDirectionTagged();
             presetsValueData = new Bag<String, String>();
+            for(String a : OsmPrimitive.uninteresting)
+                presetsValueData.add(a);
+            for(String a : OsmPrimitive.directionKeys)
+                presetsValueData.add(a);
+            for(String a : Main.pref.getCollection(PreferenceEditor.PREFIX + ".knownkeys",
+            Arrays.asList(new String[]{"is_in", "int_ref", "fixme", "population"})))
+                presetsValueData.add(a);
             for(TaggingPreset p : presets)
             {
@@ -270,4 +281,15 @@
                         TaggingPreset.Key k = (TaggingPreset.Key) i;
                         presetsValueData.add(k.key, k.value);
+                    }
+                    else if(i instanceof TaggingPreset.Text)
+                    {
+                        TaggingPreset.Text k = (TaggingPreset.Text) i;
+                        presetsValueData.add(k.key);
+                    }
+                    else if(i instanceof TaggingPreset.Check)
+                    {
+                        TaggingPreset.Check k = (TaggingPreset.Check) i;
+                        presetsValueData.add(k.key, "yes");
+                        presetsValueData.add(k.key, "no");
                     }
                 }
@@ -369,12 +391,28 @@
             {
                 List<String> values = presetsValueData.get(key);
-                if( values == null)
-                {
-                    String i = marktr("Key ''{0}'' not in presets.");
-                    errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property key"),
-                    tr(i, key), MessageFormat.format(i, key), INVALID_VALUE, p) );
-                    withErrors.add(p, "UPK");
-                }
-                else if(!values.contains(prop.getValue()))
+                if(values == null)
+                {
+                    Boolean ignore = false;
+                    for(String a : Main.pref.getCollection(PreferenceEditor.PREFIX + ".startswithkeys",
+                    Arrays.asList(new String[]{"opengeodb","openGeoDB","name:","note:"})))
+                    {
+                        if(key.startsWith(a))
+                            ignore = true;
+                    }
+                    for(String a : Main.pref.getCollection(PreferenceEditor.PREFIX + ".endswithkeys",
+                    Arrays.asList(new String[]{":forward",":backward",":left",":right"})))
+                    {
+                        if(key.endsWith(a))
+                            ignore = true;
+                    }
+                    if(!ignore)
+                    {
+                        String i = marktr("Key ''{0}'' not in presets.");
+                        errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property key"),
+                        tr(i, key), MessageFormat.format(i, key), INVALID_VALUE, p) );
+                        withErrors.add(p, "UPK");
+                    }
+                }
+                else if(values.size() > 0 && !values.contains(prop.getValue()))
                 {
                     String i = marktr("Value ''{0}'' for key ''{1}'' not in presets.");
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java	(revision 14014)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java	(revision 14015)
@@ -3,4 +3,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.geom.Area;
 import java.awt.geom.Line2D;
 import java.util.Arrays;
@@ -60,4 +61,5 @@
     public void endTest()
     {
+        Area a = Main.ds.getDataSourceArea();
         Map<Node, Way> map = new HashMap<Node, Way>();
         for(Node en : endnodes_highway)
@@ -65,5 +67,5 @@
             for(MyWaySegment s : ways)
             {
-                if(s.highway && s.nearby(en, mindist))
+                if(s.highway && s.nearby(en, mindist) && (a == null || a.contains(en.coor)))
                     map.put(en, s.w);
             }
@@ -83,5 +85,5 @@
             for(MyWaySegment s : ways)
             {
-                if(!s.highway && s.nearby(en, mindist) && !s.isArea())
+                if(!s.highway && s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.coor)))
                     map.put(en, s.w);
             }
@@ -91,5 +93,5 @@
             for(MyWaySegment s : ways)
             {
-                if(s.nearby(en, mindist) && !s.isArea())
+                if(s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.coor)))
                     map.put(en, s.w);
             }
@@ -112,5 +114,5 @@
                 for(MyWaySegment s : ways)
                 {
-                    if(s.nearby(en, minmiddledist))
+                    if(s.nearby(en, minmiddledist) && (a == null || a.contains(en.coor)))
                         map.put(en, s.w);
                 }
@@ -130,5 +132,5 @@
                 for(MyWaySegment s : ways)
                 {
-                    if(s.nearby(en, minmiddledist))
+                    if(s.nearby(en, minmiddledist) && (a == null || a.contains(en.coor)))
                         map.put(en, s.w);
                 }
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Bag.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Bag.java	(revision 14014)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Bag.java	(revision 14015)
@@ -48,4 +48,19 @@
 
     /**
+     * Adds an element to the bag
+     * @param key The key of the element
+     * @param value The element to add
+     */
+    public void add(K key)
+    {
+        List<V> values = get(key);
+        if( values == null )
+        {
+            values = new ArrayList<V>();
+            put(key, values);
+        }
+    }
+
+    /**
      * Constructor
      */
Index: /applications/editors/josm/plugins/wmsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/build.xml	(revision 14014)
+++ /applications/editors/josm/plugins/wmsplugin/build.xml	(revision 14015)
@@ -10,5 +10,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>