refs #244, fix query plan for rollback