Add combine query
Remove redundant comma in generated CSV
Remove unnecessary generator