entries/entry_keys are getting out of sync

Create issue