diff --git a/scripts/geodata/osm/osm_address_training_data.py b/scripts/geodata/osm/osm_address_training_data.py
index d8b0baa9..e896923b 100644
--- a/scripts/geodata/osm/osm_address_training_data.py
+++ b/scripts/geodata/osm/osm_address_training_data.py
@@ -1018,8 +1018,13 @@ class OSMAddressFormatter(object):
         '''
 
         house_number = address_components.get(AddressFormatter.HOUSE_NUMBER)
+        if ';' in house_number:
+            house_number = house_number.replace(';', ',')
+            address_components[AddressFormatter.HOUSE_NUMBER] = house_number
         if house_number and house_number.count(',') >= 2:
-            for num in house_number.split(','):
+            house_numbers = house_number.split(',')
+            random.shuffle(house_numbers)
+            for num in house_numbers:
                 num = num.strip()
                 if num:
                     address_components[AddressFormatter.HOUSE_NUMBER] = num