diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index deda11a2..551587e7 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -794,20 +794,18 @@ if (elapsed >= 0) {
          <a href="/epgimages/<$ *it $>" target="_blank">
 						<img src="/epgimages/<$ *it $>" class="epg_image"/>
          </a>
-<%cpp>
-	}
-	if(!epgImage.empty() ) {
-</%cpp>
+% } bool scraperImage = false;
+% if(!epgImage.empty() ) { scraperImage = true;
     <a href="/tvscraper/<$ epgImage $>" target="_blank">
 	    <img src="/tvscraper/<$ epgImage $>" class="epg_image"/>
     </a>
-%   if (episodeFound && !scraperMovieOrTv.episode.episodeImage.path.empty() ) {
-      <a href="/tvscraper/<$ scraperMovieOrTv.episode.episodeImage.path $>" target="_blank">
-        <img src="/tvscraper/<$ scraperMovieOrTv.episode.episodeImage.path $>" class="epg_image"/>
-      </a>
+% } if (episodeFound && !scraperMovieOrTv.episode.episodeImage.path.empty() ) { scraperImage = true;
+    <a href="/tvscraper/<$ scraperMovieOrTv.episode.episodeImage.path $>" target="_blank">
+      <img src="/tvscraper/<$ scraperMovieOrTv.episode.episodeImage.path $>" class="epg_image"/>
+    </a>
 <%cpp>
-    }  // episodeFound && !scraperMovieOrTv.episode.episodeImage.path.empty()
-	} else {
+  }  // episodeFound && !scraperMovieOrTv.episode.episodeImage.path.empty()
+	if (!scraperImage) {
     std::list<std::string> images1 = EpgEvents::RecImages(boxId, filename);
     size_t delimPos = boxId.find_last_of('_');
     std::string recId = (delimPos)?boxId.substr(delimPos+1):boxId;
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index d3426d50..3b8a6f85 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -208,6 +208,9 @@ msgstr ""
 msgid "Copy only"
 msgstr ""
 
+msgid "Title"
+msgstr "Název"
+
 #, fuzzy
 msgid "Short description"
 msgstr "Popis"
@@ -269,9 +272,6 @@ msgstr "Velikost písmen"
 msgid "Search in"
 msgstr "Vyhledávat v"
 
-msgid "Title"
-msgstr "Název"
-
 msgid "Episode"
 msgstr "Epizoda"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 2e8328d2..59a838a4 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -203,6 +203,9 @@ msgstr "Schnittmarken löschen"
 msgid "Copy only"
 msgstr "Nur kopieren"
 
+msgid "Title"
+msgstr "Titel"
+
 msgid "Short description"
 msgstr "Kurzbeschreibung"
 
@@ -263,9 +266,6 @@ msgstr "Groß/klein"
 msgid "Search in"
 msgstr "Suche in"
 
-msgid "Title"
-msgstr "Titel"
-
 msgid "Episode"
 msgstr "Episode"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index ef0de123..769efe3e 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -201,6 +201,9 @@ msgstr "Borrar informaci
 msgid "Copy only"
 msgstr "Copia �nicamente"
 
+msgid "Title"
+msgstr "T�tulo"
+
 msgid "Short description"
 msgstr "Descripci�n corta"
 
@@ -261,9 +264,6 @@ msgstr "Coincidir May
 msgid "Search in"
 msgstr "Buscar en"
 
-msgid "Title"
-msgstr "T�tulo"
-
 msgid "Episode"
 msgstr "Episodio"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 547d9960..716e3feb 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -201,6 +201,9 @@ msgstr "Poista merkinnät"
 msgid "Copy only"
 msgstr "Kopioi ainoastaan"
 
+msgid "Title"
+msgstr "Otsikko"
+
 msgid "Short description"
 msgstr "Lyhyt kuvaus"
 
@@ -261,9 +264,6 @@ msgstr "Huomioi kirjainkoko"
 msgid "Search in"
 msgstr "Hae kentistä"
 
-msgid "Title"
-msgstr "Otsikko"
-
 msgid "Episode"
 msgstr "Jakson nimi"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 39cd62f0..fc0e5895 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -207,6 +207,9 @@ msgstr ""
 msgid "Copy only"
 msgstr ""
 
+msgid "Title"
+msgstr "Titre"
+
 #, fuzzy
 msgid "Short description"
 msgstr "Description"
@@ -268,9 +271,6 @@ msgstr "Maj/Minuscule"
 msgid "Search in"
 msgstr "Recherche dans"
 
-msgid "Title"
-msgstr "Titre"
-
 msgid "Episode"
 msgstr "�pisode"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 0585ccdc..6e7d3805 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -207,6 +207,9 @@ msgstr "Elimina informazione marcatori"
 msgid "Copy only"
 msgstr "Solo copia"
 
+msgid "Title"
+msgstr "Titolo"
+
 msgid "Short description"
 msgstr "Descrizione breve"
 
@@ -267,9 +270,6 @@ msgstr "Maiuscolo/Minuscolo"
 msgid "Search in"
 msgstr "Cerca in"
 
-msgid "Title"
-msgstr "Titolo"
-
 msgid "Episode"
 msgstr "Episodio"
 
diff --git a/po/ka_GE.po b/po/ka_GE.po
index 7bb29a1a..8ceccccf 100644
--- a/po/ka_GE.po
+++ b/po/ka_GE.po
@@ -204,6 +204,9 @@ msgstr "ნიშნების ინფორმაციის წაშლ
 msgid "Copy only"
 msgstr "მხოლოდ კოპირება"
 
+msgid "Title"
+msgstr "სათაური"
+
 msgid "Short description"
 msgstr "მოკლე აღწერა"
 
@@ -264,9 +267,6 @@ msgstr "დიდი და პატარა ასოების სხვ
 msgid "Search in"
 msgstr "სად ვეძებო"
 
-msgid "Title"
-msgstr "სათაური"
-
 msgid "Episode"
 msgstr "ეპიზოდი"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index b4be4e6d..f2a75673 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -202,6 +202,9 @@ msgstr ""
 msgid "Copy only"
 msgstr ""
 
+msgid "Title"
+msgstr "Pavadinimas"
+
 #, fuzzy
 msgid "Short description"
 msgstr "Aprašymas"
@@ -263,9 +266,6 @@ msgstr "Kreiti dėmesį į raidžių registrą"
 msgid "Search in"
 msgstr "Ieškoti"
 
-msgid "Title"
-msgstr "Pavadinimas"
-
 msgid "Episode"
 msgstr "Epizodas"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index e97e5600..1b350484 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -207,6 +207,9 @@ msgstr ""
 msgid "Copy only"
 msgstr ""
 
+msgid "Title"
+msgstr ""
+
 msgid "Short description"
 msgstr ""
 
@@ -267,9 +270,6 @@ msgstr "Idem case"
 msgid "Search in"
 msgstr ""
 
-msgid "Title"
-msgstr ""
-
 msgid "Episode"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index cbb77e1a..d895b175 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -202,6 +202,9 @@ msgstr "Usuń informację o znacznikach"
 msgid "Copy only"
 msgstr "Skopiuj do katalogu"
 
+msgid "Title"
+msgstr "Tytuł"
+
 msgid "Short description"
 msgstr "Krótki opis"
 
@@ -262,9 +265,6 @@ msgstr "Uwzględnij wielkość liter"
 msgid "Search in"
 msgstr "Szukaj w"
 
-msgid "Title"
-msgstr "Tytuł"
-
 msgid "Episode"
 msgstr "Epizod"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3e846d99..b18f9958 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -201,6 +201,9 @@ msgstr "Удалить маркеры"
 msgid "Copy only"
 msgstr "Копировать"
 
+msgid "Title"
+msgstr "Название"
+
 msgid "Short description"
 msgstr "Краткое описание"
 
@@ -261,9 +264,6 @@ msgstr "С учетом регистра"
 msgid "Search in"
 msgstr "Искать в"
 
-msgid "Title"
-msgstr "Название"
-
 msgid "Episode"
 msgstr "Эпизод"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 2e0e69fc..aac11fb0 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -202,6 +202,9 @@ msgstr "Vymaza
 msgid "Copy only"
 msgstr "Iba kop�rova�"
 
+msgid "Title"
+msgstr "V n�zve"
+
 msgid "Short description"
 msgstr "Stru�n� opis"
 
@@ -262,9 +265,6 @@ msgstr "Pr
 msgid "Search in"
 msgstr "H�ada� v"
 
-msgid "Title"
-msgstr "V n�zve"
-
 msgid "Episode"
 msgstr "v epiz�de"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index aee01eaa..6d63d262 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -201,6 +201,9 @@ msgstr "Ta bort märkningsinformation"
 msgid "Copy only"
 msgstr "Kopiera endast"
 
+msgid "Title"
+msgstr "Titel"
+
 msgid "Short description"
 msgstr "Kort beskrivning"
 
@@ -261,9 +264,6 @@ msgstr "Matcha versaler / gemener"
 msgid "Search in"
 msgstr "Sök i"
 
-msgid "Title"
-msgstr "Titel"
-
 msgid "Episode"
 msgstr "Avsnitt"