diff --git a/miku/plugins/plex.lua b/miku/plugins/plex.lua
index 8d7dac2..f654300 100644
--- a/miku/plugins/plex.lua
+++ b/miku/plugins/plex.lua
@@ -58,7 +58,7 @@ function plex:get_plex(query)
   end
 	
   if data.parentTitle then
-	artist = '<b>'..data.parentTitle..'</b>'
+	artist = 'von <b>'..data.parentTitle..'</b>'
   else
 	artist = ''
   end
@@ -83,14 +83,17 @@ function plex:get_plex(query)
 	
   if data.originallyAvailableAt then
 	date = makeOurDate(data.originallyAvailableAt)
+    date1 = '\n<b>Ausstrahlung:</b> '..date
+    date2 = '\n<b>Veröffentlicht:</b> '..date
   elseif data.year then
 	date = data.year
+    date1 = '\n<b>Ausstrahlung:</b> '..date
+    date2 = '\n<b>Veröffentlicht:</b> '..date
   else
 	date = ''
+    date1 = date
+    date2 = date
   end
-  
-  local date1 = '\n<b>Ausstrahlung:</b> '..date
-  local date2 = '\n<b>Veröffentlicht:</b> '..date
 	
   if data.leafCount then
     if data.leafCount > 1 then
@@ -146,7 +149,7 @@ function plex:get_plex(query)
   elseif data.librarySectionTitle == 'Filme' then
     text = title..tag..origtitle..studio..date2..fsk..duration..rating..desc
   elseif data.librarySectionTitle == 'Musik' then
-    text = title..' von '..artist..date2
+    text = title..artist..date2
   elseif data.librarySectionTitle == 'Serien' then
     text = title..from..studio..date1..episodes..fsk..duration..rating..desc
   elseif data.librarySectionTitle == 'YouTube Serien' then