refactoring, saved searches working again