Fix: date formatter and dirty