Partial fix for adding/changing entries