Modified for edit and search form
Modified for edit and search form