Tidying search types. extracting factory methods for ServiceProblemScenario