WIP: Fix handling of deleted records #35