Fix etag setting; Look for entry guids before inserts