I'm just now seeing that you've made a bunch of changes/additions to this new apartment complex. In this case, if all the buildings have the same (397) address, I would create an outer area that encompasses the whole complex. Then add the address tags to that, and remove them from the individual buildings.
Thanks again for your contributions!