Fixed loading data when snapshot was removed
code refactoring