Some cleanup in the sectino about query large datasets