Fix multiple entry delete logic