diff --git a/scripts/geodata/osm/fetch_osm_address_data.sh b/scripts/geodata/osm/fetch_osm_address_data.sh
index a8959957..5884eba1 100755
--- a/scripts/geodata/osm/fetch_osm_address_data.sh
+++ b/scripts/geodata/osm/fetch_osm_address_data.sh
@@ -134,8 +134,14 @@ osmfilter $PLANET_BORDERS_LATLONS --keep="$VALID_ADMIN_BORDER_KEYS or $VALID_LOC
 rm $PLANET_BORDERS_LATLONS
 
 echo "Filtering for neighborhoods"
+PLANET_NEIGHBORHOODS_O5M="planet-neighborhoods.o5m"
 PLANET_NEIGHBORHOODS="planet-neighborhoods.osm"
-osmfilter $PLANET_O5M --keep="name= and ( $VALID_LOCALITY_KEYS )" --drop-relations --drop-ways --ignore-dependencies --drop-author --drop-version -o=$PLANET_NEIGHBORHOODS
+osmfilter $PLANET_O5M --keep="name= and ( $VALID_LOCALITY_KEYS )" --drop-author --drop-version -o=$PLANET_NEIGHBORHOODS_O5M
+PLANET_NEIGHBORHOODS_LATLONS="planet-neighborhoods-latlons.o5m"
+osmconvert $PLANET_NEIGHBORHOODS_O5M --max-objects=1000000000 --all-to-nodes -o=$PLANET_NEIGHBORHOODS_LATLONS
+rm $PLANET_NEIGHBORHOODS_O5M
+osmfilter $PLANET_NEIGHBORHOODS_LATLONS --keep="name= and ( $VALID_LOCALITY_KEYS )" -o=$PLANET_NEIGHBORHOODS
+rm $PLANET_NEIGHBORHOODS_LATLONS
 
 echo "Filtering for subdivision polygons"
 PLANET_SUBDIVISIONS="planet-subdivisions.osm"