checkpoint, before saving query