rework: entities properly updated when snapshot exists