[TASK][WIP] small fix for the edit
[TASK][WIP] small fix for the delete