EntityList refactoring for SearchService

EntityList refactoring for SearchService