Fixing file tree expansion on move.
Fixing handling after folder save.