Fix format issue for commas

Also get counts for compound fields