DateTimeLabel2 improvement