OSM join and containment queries update and tested.