trying to clean up the rtree skipping logic on update