move to savepoint based validation queries