diff --git a/resources/dictionaries/ca/place_names.txt b/resources/dictionaries/ca/place_names.txt
index f82a3f94..9a98e871 100644
--- a/resources/dictionaries/ca/place_names.txt
+++ b/resources/dictionaries/ca/place_names.txt
@@ -35,7 +35,6 @@ comissaria|com
 convent|convt
 correus|corr
 corretatge
-convent
 cooperativa
 devesa
 disseminat
diff --git a/scripts/geodata/address_expansions/address_dictionaries.py b/scripts/geodata/address_expansions/address_dictionaries.py
index f450b049..4107d523 100644
--- a/scripts/geodata/address_expansions/address_dictionaries.py
+++ b/scripts/geodata/address_expansions/address_dictionaries.py
@@ -149,8 +149,8 @@ def create_address_expansion_rules_file(base_dir=ADDRESS_EXPANSIONS_DIR, output_
                 else:
                     canonical_index = -1
 
-                for p in phrases:
-                    language_canonical_dictionaries[(p, canonical_index)].append(dictionary_type)
+                for i, p in enumerate(phrases):
+                    language_canonical_dictionaries[p, canonical_index if i > 0 else -1].append(dictionary_type)
 
         for (phrase, canonical_index), dictionary_types in language_canonical_dictionaries.iteritems():
             max_dictionary_types = max(max_dictionary_types, len(dictionary_types))
@@ -161,7 +161,6 @@ def create_address_expansion_rules_file(base_dir=ADDRESS_EXPANSIONS_DIR, output_
             expansion_rules.append(rule_template)
             num_language_rules += 1
 
-
         address_languages.append(address_language_index_template.format(language=quote_string(language),
                                                                         index=language_index,
                                                                         length=num_language_rules))