A few changes to get the full list as CSV