diff --git a/src/UI/AddSeries/SearchResultViewTemplate.hbs b/src/UI/AddSeries/SearchResultViewTemplate.hbs
index 463ec08bb..12e5e7310 100644
--- a/src/UI/AddSeries/SearchResultViewTemplate.hbs
+++ b/src/UI/AddSeries/SearchResultViewTemplate.hbs
@@ -1,7 +1,7 @@
 <div class="search-item {{#unless isExisting}}search-item-new{{/unless}}">
     <div class="row">
         <div class="col-md-2">
-            <a href="{{traktUrl}}" target="_blank">
+            <a href="{{tvdbUrl}}" target="_blank">
                 <img class="new-series-poster" src="{{remotePoster}}"
                 {{defaultImg}} >
             </a>
diff --git a/src/UI/Handlebars/Helpers/Series.js b/src/UI/Handlebars/Helpers/Series.js
index 7d1276c22..8ad3a23e6 100644
--- a/src/UI/Handlebars/Helpers/Series.js
+++ b/src/UI/Handlebars/Helpers/Series.js
@@ -69,6 +69,10 @@ define(
                 return this.title;
             }
 
+            if (!this.year) {
+                return this.title;
+            }
+
             return new Handlebars.SafeString('{0} <span class="year">({1})</span>'.format(this.title, this.year));
         });
     });
diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
index 70afc8073..6a5403c79 100644
--- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
@@ -208,7 +208,6 @@
 
     <div class="form-group">
         <label class="col-sm-3 control-label">Anime Episode Example</label>
-
         <div class="col-sm-8">
             <p class="form-control-static x-anime-episode-example naming-example"></p>
         </div>