Repaired edit event functionality