added deferred listeners for edit and removal