diff --git a/src/expand.c b/src/expand.c
index 9f38e3db..45b506ab 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -559,6 +559,8 @@ static inline uint32_t gazetteer_valid_components(uint16_t dictionary_id) {
             return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET | LIBPOSTAL_ADDRESS_CATEGORY | LIBPOSTAL_ADDRESS_NEAR | LIBPOSTAL_ADDRESS_TOPONYM | LIBPOSTAL_ADDRESS_UNIT | LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_STAIRCASE | LIBPOSTAL_ADDRESS_ENTRANCE;
         case DICTIONARY_STOPWORD:
             return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET | LIBPOSTAL_ADDRESS_CATEGORY | LIBPOSTAL_ADDRESS_NEAR | LIBPOSTAL_ADDRESS_TOPONYM;
+        case DICTIONARY_STREET_NAME:
+            return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET;
         case DICTIONARY_STREET_TYPE:
             return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET;
         case DICTIONARY_SYNONYM:
@@ -614,6 +616,8 @@ static inline uint32_t gazetteer_possible_root_components(uint16_t dictionary_id
             return LIBPOSTAL_ADDRESS_STREET;
         case DICTIONARY_QUALIFIER:
             return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET;
+        case DICTIONARY_STREET_NAME:
+            return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET;
         case DICTIONARY_SYNONYM:
             return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET;
         case DICTIONARY_TOPONYM: