diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
index bd3c5af048..e2ae0fadc8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
@@ -14,27 +14,14 @@ Reference Manager or ProCite.
 
 <MESSAGE>
 ---------------------------------------------
-
 <!-- TMPL_IF NAME="comment" -->
-    <!-- TMPL_VAR NAME="comment" -->
+<!-- TMPL_VAR NAME="comment" -->
 <!-- /TMPL_IF -->
-
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-    <!-- TMPL_VAR NAME="title" -->
-    <!-- TMPL_IF name="subtitle" -->
-       <!-- TMPL_VAR NAME="subtitle" -->
-    <!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="MARCAUTHORS" -->
-<!-- TMPL_LOOP NAME="MARCAUTHORS"-->
-    Authors: <!-- TMPL_VAR NAME="value" -->
-<!-- /TMPL_LOOP -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="publishercode" -->
-
-ISBN: <!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF --><!-- TMPL_IF name="author" -->
-Published by: <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><!-- TMPL_IF name="collection" -->
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="MARCAUTHORS" -->
+Author(s): <!-- TMPL_LOOP NAME="MARCAUTHORS" --><!-- TMPL_LOOP NAME="MARCAUTHOR_SUBFIELDS_LOOP" --><!-- TMPL_VAR NAME="separator" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_LOOP --><!-- TMPL_UNLESS NAME="__last__" -->; <!-- TMPL_ELSE -->
+<!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><!-- /TMPL_IF --><!-- TMPL_IF name="ISBN" -->
+ISBN: <!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="publishercode" -->Published by: <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><!-- TMPL_IF name="collection" -->
 Collection: <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="subject" -->
 Subject: <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><!-- TMPL_IF name="copyrightdate" -->
 Copyright year: <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="notes" -->
@@ -46,8 +33,9 @@ Classification: <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><!-- TMP
 LCCN: <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><!-- TMPL_IF name="url" -->
 URL : <!-- TMPL_VAR NAME="url" --><!-- /TMPL_IF -->
 Items : <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-	<!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="barcode" -->
-<!-- /TMPL_LOOP -->
+	<!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="barcode" --><!-- /TMPL_LOOP -->
+
 ---------------------------------------------
+
 <!-- /TMPL_LOOP -->
 <END_MESSAGE>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl
index 640f39f22b..204fd207f5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl
@@ -14,28 +14,14 @@ Reference Manager or ProCite.
 
 <MESSAGE>
 ---------------------------------------------
-
 <!-- TMPL_IF NAME="comment" -->
-    <!-- TMPL_VAR NAME="comment" -->
+<!-- TMPL_VAR NAME="comment" -->
 <!-- /TMPL_IF -->
-
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-    <!-- TMPL_VAR NAME="title" -->
-    <!-- TMPL_IF name="subtitle" -->
-       <!-- TMPL_VAR NAME="subtitle" -->
-    <!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="MARCAUTHORS" -->
-<!-- TMPL_LOOP NAME="MARCAUTHORS"-->
-    Authors: <!-- TMPL_VAR NAME="value" -->
-<!-- /TMPL_LOOP -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="ISBN" -->
-ISBN: <!-- TMPL_VAR NAME="ISBN" -->
-<!-- /TMPL_IF -->
-<!-- TMPL_IF name="publishercode" -->
-Published by: <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><!-- TMPL_IF name="collection" -->
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="MARCAUTHORS" -->
+Author(s): <!-- TMPL_LOOP NAME="MARCAUTHORS" --><!-- TMPL_LOOP NAME="MARCAUTHOR_SUBFIELDS_LOOP" --><!-- TMPL_VAR NAME="separator" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_LOOP --><!-- TMPL_UNLESS NAME="__last__" -->; <!-- TMPL_ELSE -->
+<!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><!-- /TMPL_IF --><!-- TMPL_IF name="ISBN" -->
+ISBN: <!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="publishercode" -->Published by: <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><!-- TMPL_IF name="collection" -->
 Collection: <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="subject" -->
 Subject: <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><!-- TMPL_IF name="copyrightdate" -->
 Copyright year: <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="notes" -->
@@ -47,8 +33,9 @@ Classification: <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><!-- TMP
 LCCN: <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><!-- TMPL_IF name="url" -->
 URL : <!-- TMPL_VAR NAME="url" --><!-- /TMPL_IF -->
 Items : <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-    <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="barcode" -->
-<!-- /TMPL_LOOP -->
+    <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="barcode" --><!-- /TMPL_LOOP -->
+
 ---------------------------------------------
+
 <!-- /TMPL_LOOP -->
 <END_MESSAGE>