Fix timestamp field mapping