Improve recovery / snapshot restoring file identity handling

TODO