add building:part geometries to building queries
exclude building "shells" that enclose building parts, as these should not be rendered
merging query updates from master