format field list more
Merge branch 'JW'