The previous solution was correct. The name is used in official addresses.

Moreover, the current interpolation suggests that numbers are in between, on the line, like a terrace, which is not accurate for flats.

I would suggest restoring the previous tags to the overall buildings.