Added query.csv to output (and corrected lurking bug in reader).