Refactored SurveyListItem fields