Refactoring Saved Search and Adding Update