better handling of --use-folder in restore cases