Working on edit from search