Fix the issue that missing handling for date format