diff --git a/db/const.go b/db/const.go
index e5e6088..3104153 100644
--- a/db/const.go
+++ b/db/const.go
@@ -37,7 +37,7 @@ const (
 	LanguageCN = "zh-CN"
 )
 
-const DefaultNamingFormat = "{{.NameCN}} {{.NameEN}} ({{.Year}})"
+const DefaultNamingFormat = "{{.NameCN}} {{.NameEN}} {{if .Year}} ({{.Year}}) {{end}}"
 
 type NamingInfo struct {
 	NameCN string
diff --git a/server/core/importlist.go b/server/core/importlist.go
index a9684d0..69e3bf8 100644
--- a/server/core/importlist.go
+++ b/server/core/importlist.go
@@ -425,7 +425,9 @@ func (c *Client) SuggestedSeriesFolderName(tmdbId int) (string, error) {
 		if err != nil {
 			log.Errorf("get en tv detail error: %v", err)
 		} else {
-			info.NameEN = stripExtraCharacters(en.Name)
+			if en.Name != name { //sometimes en name is in chinese
+				info.NameEN = stripExtraCharacters(en.Name)
+			}
 		}
 	}
 	year := strings.Split(d.FirstAirDate, "-")[0]
diff --git a/server/setting.go b/server/setting.go
index b0d5843..26861c2 100644
--- a/server/setting.go
+++ b/server/setting.go
@@ -34,7 +34,7 @@ func (s *Server) SetSetting(c *gin.Context) (interface{}, error) {
 		return nil, errors.Wrap(err, "bind json")
 	}
 	utils.TrimFields(&in)
-	
+
 	log.Infof("set setting input: %+v", in)
 	if in.TmdbApiKey != "" {
 		if err := s.db.SetSetting(db.SettingTmdbApiKey, in.TmdbApiKey); err != nil {
@@ -54,18 +54,23 @@ func (s *Server) SetSetting(c *gin.Context) (interface{}, error) {
 		}
 	}
 	if in.TvNamingFormat != "" {
-		if _, err := template.New("test").Parse(in.TvNamingFormat);err != nil {
+		if _, err := template.New("test").Parse(in.TvNamingFormat); err != nil {
 			return nil, errors.Wrap(err, "tv format")
 		}
 
 		s.db.SetSetting(db.SettingTvNamingFormat, in.TvNamingFormat)
+	} else {
+		s.db.SetSetting(db.SettingTvNamingFormat, "")
 	}
+
 	if in.MovieNamingFormat != "" {
-		if _, err := template.New("test").Parse(in.MovieNamingFormat);err != nil {
+		if _, err := template.New("test").Parse(in.MovieNamingFormat); err != nil {
 			return nil, errors.Wrap(err, "movie format")
 		}
 
 		s.db.SetSetting(db.SettingMovieNamingFormat, in.MovieNamingFormat)
+	} else {
+		s.db.SetSetting(db.SettingMovieNamingFormat, "")
 	}
 
 	plexmatchEnabled := s.db.GetSetting(db.SettingPlexMatchEnabled)
diff --git a/ui/lib/widgets/detail_card.dart b/ui/lib/widgets/detail_card.dart
index c47388f..ee33bd9 100644
--- a/ui/lib/widgets/detail_card.dart
+++ b/ui/lib/widgets/detail_card.dart
@@ -72,7 +72,7 @@ class _DetailCardState extends ConsumerState<DetailCard> {
                       children: [
                         //const Text(""),
                         Text(
-                          "${widget.details.name} ${widget.details.name != widget.details.originalName ? widget.details.originalName : ''} (${widget.details.airDate!.split("-")[0]})",
+                          "${widget.details.name} ${widget.details.name != widget.details.originalName ? widget.details.originalName : ''} ${widget.details.airDate == null? "": (widget.details.airDate!.split("-")[0])}",
                           style: const TextStyle(
                               fontSize: 24,
                               fontWeight: FontWeight.bold,