Collection Restore Fixes

Fixes restore with empty-mismatch and prevents error case with nested restore of collections.