Add proper dateformats too, bug 18308