Updated ReportDefinitionServiceImpl to use LinkedHashMap for evaluated data sets so that order is maintained