Fix regex match for date and time