fixing problem with mixed date and date-range strings