diff --git a/gui/slick/interfaces/default/comingEpisodes.tmpl b/gui/slick/interfaces/default/comingEpisodes.tmpl
index 8b654896..f4d1e434 100644
--- a/gui/slick/interfaces/default/comingEpisodes.tmpl
+++ b/gui/slick/interfaces/default/comingEpisodes.tmpl
@@ -120,6 +120,7 @@
     <tbody>
 
     #for $cur_result in $sql_results:
+        #set $cur_indexer = int($cur_result["indexer"])
 
         #if int($cur_result["paused"]) and not $sickbeard.COMING_EPS_DISPLAY_PAUSED:
             #continue
@@ -167,7 +168,12 @@
         	<a href="http://www.imdb.com/title/${cur_result["imdb_id"]}" onclick="window.open(this.href, '_blank'); return false;" title="http://www.imdb.com/title/${cur_result["imdb_id"]}"><img alt="[imdb]" height="16" width="16" src="$sbRoot/images/imdb.png" /> 
         #end if
         </td>
-        <td align="center"><a href="$sickbeard.indexerApi($cur_result["indexer"]).config["show_url"]${cur_result["showid"]}" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;" title="$sickbeard.indexerApi($cur_result["indexer"]).config["show_url"]${cur_result["showid"]}"><img alt="["'+$sickbeard.indexerApi($cur_result["indexer"]).name+'"]" height="16" width="16" src="$sbRoot/images/$sickbeard.indexerApi($cur_result["indexer"]).config["icon"]" /></a></td>
+        <td align="center"><a href="$sickbeard.indexerApi($cur_indexer).config["show_url"]${cur_result["showid"]}"
+        rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href,
+        '_blank'); return false;" title="$sickbeard.indexerApi($cur_indexer)
+        .config["show_url"]${cur_result["showid"]}"><img alt="$sickbeard.indexerApi($cur_indexer)
+        .name" height="16" width="16" src="$sbRoot/images/$sickbeard.indexerApi($cur_indexer).config["icon"]"
+        /></a></td>
         <td align="center">
         <a href="$sbRoot/home/searchEpisode?show=${cur_result["showid"]}&amp;season=$cur_result["season"]&amp;episode=$cur_result["episode"]" title="Manual Search" id="forceUpdate-${cur_result["showid"]}" class="forceUpdate epSearch"><img alt="[search]" height="16" width="16" src="$sbRoot/images/search32.png" id="forceUpdateImage-${cur_result["showid"]}" /></a>
         </td>
@@ -206,6 +212,8 @@
     #end if
     
     #for $cur_result in $sql_results:
+        #set $cur_indexer = int($cur_result["indexer"])
+
     <!-- start $cur_result["show_name"] //-->
         
         #if int($cur_result["paused"]) and not $sickbeard.COMING_EPS_DISPLAY_PAUSED:
@@ -303,7 +311,12 @@
 				#if $cur_result["imdb_id"]:          	  	
           	      <a href="http://www.imdb.com/title/${cur_result["imdb_id"]}" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;" title="http://www.imdb.com/title/${cur_result["imdb_id"]}"><img alt="[imdb]" height="16" width="16" src="$sbRoot/images/imdb.png" /> 
           	    #end if
-                    <a href="$sickbeard.indexerApi($cur_result["indexer"]).config["show_url"]${cur_result["showid"]}" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;" title="$sickbeard.indexerApi($cur_result["indexer"]).config["show_url"]${cur_result["showid"]}"><img alt="$sickbeard.indexerApi($cur_result["indexer"]).name" height="16" width="16" src="$sbRoot/images/$sickbeard.indexerApi($cur_result["indexer"]).config["icon"]" /></a>
+                    <a href="$sickbeard.indexerApi($cur_indexer).config["show_url"]${cur_result["showid"]}"
+                    rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href,
+                    '_blank'); return false;" title="$sickbeard.indexerApi($cur_indexer)
+                    .config["show_url"]${cur_result["showid"]}"><img alt="$sickbeard.indexerApi($cur_indexer).name"
+                    height="16" width="16" src="$sbRoot/images/$sickbeard.indexerApi($cur_indexer).config["icon"]"
+                    /></a>
           	      <span><a href="$sbRoot/home/searchEpisode?show=${cur_result["showid"]}&amp;season=$cur_result["season"]&amp;episode=$cur_result["episode"]" title="Manual Search" id="forceUpdate-${cur_result["showid"]}" class="epSearch forceUpdate"><img alt="[search]" height="16" width="16" src="$sbRoot/images/search32.png" id="forceUpdateImage-${cur_result["showid"]}" /></a></span>
           	  </span>
           	</div>
diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py
index 437d4bae..674051b0 100644
--- a/sickbeard/show_queue.py
+++ b/sickbeard/show_queue.py
@@ -269,7 +269,7 @@ class QueueItemAdd(ShowQueueItem):
                 self._finishEarly()
                 return
         except Exception, e:
-            logger.log(u"Unable to find show ID:" + str(self.indexer_id) + "on Indexer: " + sickbeard.indexerApi(
+            logger.log(u"Unable to find show ID:" + str(self.indexer_id) + " on Indexer: " + sickbeard.indexerApi(
                 self.indexer).name, logger.ERROR)
             ui.notifications.error("Unable to add show",
                                    "Unable to look up the show in " + self.showDir + " on " + sickbeard.indexerApi(
diff --git a/sickbeard/tvcache.py b/sickbeard/tvcache.py
index 9ed68de8..9aff865c 100644
--- a/sickbeard/tvcache.py
+++ b/sickbeard/tvcache.py
@@ -292,7 +292,7 @@ class TVCache():
                     except (MultipleShowObjectsException):
                         showObj = None
                     if showObj:
-                        self.indexer = showObj.indexer
+                        self.indexer = int(showObj.indexer)
                         indexer_lang = showObj.lang
 
         # if we weren't provided with season/episode information then get it from the name that we parsed