Fix/date handling

@amillet89 @harrietgrace

Addresses https://segment.zendesk.com/agent/tickets/21028.