Change the logic for building matching to use --building everywhere except the inital match and to prefilter with a manually computed degree-based bounding box expansion