Added support for date/month and date/month/year or next/previous working day expression