diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py
index 34a11dbc..5c274a61 100644
--- a/scripts/geodata/osm/formatter.py
+++ b/scripts/geodata/osm/formatter.py
@@ -499,7 +499,14 @@ class OSMAddressFormatter(object):
                 elif six.u(',') in name:
                     name = name.split(six.u(','), 1)[0]
 
-                for i in xrange(num_references if is_default and name_tag == 'name' else 1):
+                n = min_references / 2
+                if name_tag == 'name':
+                    if is_default:
+                        n = num_references
+                    else:
+                        n = num_references / 2
+
+                for i in xrange(n):
                     address_components = {component_name: name.strip()}
                     self.components.add_admin_boundaries(address_components, osm_components, country, language,
                                                          random_key=is_default,