moved responsibility for search term handling to output classes