Changes to intersects/geoIntersects