updates date handling to deal with flexible date field usage