I have a question about this changeset.  

At number 60, you changed an addr:flats=1 to addr:unit=Flat 1; but left the addr:flats=5-12 in place (correcting my typo).   But if addr:flats is correct for Flat 5, why should it be addr:unit=Flat 1 for Flat 1?

I don't think either style is wrong, but it was (an attempt at) consistent before this changeset, and now there's two styles.