Fix move/restore of empty folders