Search activity and related refactoring.