Properly use NoIndexRestore and NoOptionsRestore flags