diff --git a/lib/AudioBook.php b/lib/AudioBook.php
index 699e98a..19a2f61 100644
--- a/lib/AudioBook.php
+++ b/lib/AudioBook.php
@@ -82,7 +82,8 @@ class AudioBook extends DbMapping
                             Notices.[Author] AS author,
                             LTRIM(RTRIM(Notices.[NoticeNr])) AS code,
                             Fields.[520] AS summary,
-                            Fields.[260b] + ' ' + Fields.[260c] AS editor,
+                            REPLACE(Fields.[260b], ',', '') AS editor,
+                            LEFT(SUBSTRING(Fields.[260c], PATINDEX('%%[0-9]%%', Fields.[260c]), 8000), PATINDEX('%%[^0-9]%%', SUBSTRING(Fields.[260c], PATINDEX('%%[0-9]%%', Fields.[260c]), 8000) + 'X')-1) AS year,
                             Fields.[300] AS media,
                             Fields.[490a] AS collection,
                             isbn.DisplayText AS isbn,