Fix tenders mapping and output new data