Don't try to include columns in the download if there's no data for it.
Use the full column name when we're not downloading shapefiles.