Improve restoring auto-save query editor