Added a predicate to allow filtering of buildings with or all buildings