improve edit form
improve edit form
fix search