rollback search refactoring change