diff --git a/modules/ui/fields/address.js b/modules/ui/fields/address.js
index 0a19e999f..04eefbbf7 100644
--- a/modules/ui/fields/address.js
+++ b/modules/ui/fields/address.js
@@ -82,18 +82,18 @@ export function uiFieldAddress(field, context) {
 
 
         function isAddressable(d) {
-            if (d.tags.name &&
-                (d.tags.admin_level === '8' || d.tags.border_type === 'city'))
-                return true;
+            if (d.tags.name) {
+                if (d.tags.admin_level === '8' && d.tags.boundary === 'administrative')
+                    return true;
+                if (d.tags.border_type === 'city')
+                    return true;
+                if (d.tags.place === 'city' || d.tags.place === 'town' || d.tags.place === 'village')
+                    return true;
+            }
 
-            if (d.tags.place && d.tags.name && (
-                    d.tags.place === 'city' ||
-                    d.tags.place === 'town' ||
-                    d.tags.place === 'village'))
+            if (d.tags['addr:city'])
                 return true;
 
-            if (d.tags['addr:city']) return true;
-
             return false;
         }
     }