discovery2csv: Fix up to match results format