include building enclosures as well

There were cases where the building shells overlapped with other
building parts, and weren't being displayed as a result. This also has
the side effect of speeding up the queries.
Merge branch 'master' into dev