Improve edit and edit-find