fixes to domain model snapshot restoratation