Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 24144)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 24145)
@@ -189,6 +189,9 @@
 				// setup guessing handlers for address tags
 				GuessedValueHandler[] guessers = new GuessedValueHandler[]{
-						new GuessStreetValueHandler(TagUtils.ADDR_STREET_TAG, aNode),
+						new GuessStreetValueHandler(TagUtils.ADDR_STREET_TAG, aNode),						
 						new GuessedValueHandler(TagUtils.ADDR_POSTCODE_TAG, aNode, 500.0),
+						new GuessedValueHandler(TagUtils.ADDR_CITY_TAG, aNode, 5000.0),
+						new GuessedValueHandler(TagUtils.ADDR_STATE_TAG, aNode, 5000.0),
+						new GuessedValueHandler(TagUtils.ADDR_COUNTRY_TAG, aNode, 5000.0),
 						new GuessedValueHandler(TagUtils.ADDR_CITY_TAG, aNode, 2000.0)
 				};