Fix regex for new date. Fix cutting date to save