hotfix address_map -> street_number_map