fix Date & Track to handle empty strings