Saved-search refactoring...