Modified for edit and search form
Merge origin/master