Refactoring Saved Search API