Remove extra SavedSearchFactory calls. MJ-564