Keep polygon and centroid queries in line