completing edit & search section