fixing date string matching