fixes for the restore operation and the UI related to it