diff --git a/scripts/geodata/address_formatting/formatter.py b/scripts/geodata/address_formatting/formatter.py
index 7908ee03..2d5600bf 100644
--- a/scripts/geodata/address_formatting/formatter.py
+++ b/scripts/geodata/address_formatting/formatter.py
@@ -224,7 +224,7 @@ class AddressFormatter(object):
 
         if tag_components:
             template_text = self.tag_template_separators(template_text)
-            components = {k: u' '.join([u'{}/{}'.format(t, k.replace(' ', '_'))
+            components = {k: u' '.join([u'{}/{}'.format(t.replace(' ', ''), k.replace(' ', '_'))
                                         for t, c in tokenize(v)])
                           for k, v in components.iteritems()}