better event handling on delete and property update