More sample fields and a fix to output of date fields