Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.form
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.form	(revision 18895)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.form	(revision 18896)
@@ -26,10 +26,10 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="1" attributes="0">
-                  <Component id="streetComboBox" pref="199" max="32767" attributes="0"/>
+                  <Component id="streetComboBox" pref="175" max="32767" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="relocateButton" min="-2" max="-2" attributes="0"/>
               </Group>
               <Group type="102" alignment="0" attributes="0">
-                  <Component id="keepOddityCheckBox" pref="278" max="32767" attributes="0"/>
+                  <Component id="keepOddityCheckBox" pref="282" max="32767" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 18895)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 18896)
@@ -1,4 +1,5 @@
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
+import java.util.Set;
 import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedListModel;
 import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedComboBoxModel;
@@ -182,5 +183,7 @@
             } while ((oldNum + newNum) % 2 == 1 &&
                      houseList.getSelectedIndex() != 0);
-            
+
+        // If anything goes wrong, we can silently ignore the errors.
+        // The selected item just does not get updated...
         } catch (Exception exp) {}
     }
@@ -424,10 +427,4 @@
             super("nepřiřazené domy");
             Reasoner.getInstance().addListener(this);
-
-            for (AddressElement house : Reasoner.getInstance().getUnassignedElements())
-                if (house instanceof House)
-                    houses.add((House) house);
-
-            Collections.sort(houses);
         }
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java	(revision 18895)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java	(revision 18896)
@@ -206,4 +206,5 @@
             matches = new HashMap<AddressElement, Integer>();
             primMatchIndex.put(prim, matches);
+            primToUpdate.add(prim);
         }
 
@@ -233,4 +234,5 @@
             matches = new HashMap<OsmPrimitive, Integer>();
             elemMatchIndex.put(elem, matches);
+            elemToUpdate.add(elem);
         }
 
@@ -313,5 +315,4 @@
     private int getQ(OsmPrimitive prim, AddressElement elem) {
 
-        // TODO: This is a workaround. We should not be here at all.
         if (elemMatchIndex.get(elem) == null) return MATCH_NOMATCH;
         if (primMatchIndex.get(prim) == null) return MATCH_NOMATCH;
@@ -394,5 +395,5 @@
      *
      * <p>This method is probably the single most used method of the reasoner.
-     * It allows the unique translation between map and the database.</p>
+     * It allows the unique translation between the map and the database.</p>
      *
      * <p>An element <i>elem</i> and primitive <i>prim</i> can be translated