Prevent duplicate item exception and partially updated serverSnapshot

This change fixes #82