diff --git a/Templates/Def_Simple.def b/Templates/Def_Simple.def
index 2065cb9e11e79a3329cd91bb44bf1191da1268c3..7c66773dc2de34d39205238ca5747a95cb7f333f 100644
--- a/Templates/Def_Simple.def
+++ b/Templates/Def_Simple.def
@@ -12,6 +12,16 @@
     "poet": "The poet",
     "poetdate": "from-to",
 
+    #"arranger": u"<<arranger>>",
+    #"opus": u"<<opus>>",
+    #"instrumentation": u"<<instrumentation>>",
+    #"key": u"<<key>>",
+    #"language": u"<<language>>",
+    #"duration": u"<<duration>>",
+    #"composition_year": u"<<composition_year>>",
+    #"score_information": u"<<score_information>>",
+    #"genre": u"<<genre>>",
+
     "year": "2009",
     "publisher": "Edition Kainhofer, Vienna",
     "editor": "Reinhold Kainhofer",
diff --git a/Templates/default/webshop_descriptions.def b/Templates/default/webshop_descriptions.def
index 710b9f4d3c856ecdd8d733a81260c6a4902068b7..63ef46f9c844c03708c9230e5c2fac9d72a892b9 100644
--- a/Templates/default/webshop_descriptions.def
+++ b/Templates/default/webshop_descriptions.def
@@ -1,6 +1,8 @@
 {
-#  "subtitle": u"<< subtitle >>",
-#  "subtitle_en": u"<< subtitle_en |default(subtitle) >>",
+  #"title": u"<< title|replace('\"', "&quot;") >>",
+  #"title_en": u"<< title_en|default(title)|replace('\"', "&quot;") >>",
+  #"subtitle": u"<< subtitle|replace('\"', "&quot;") >> >>",
+  #"subtitle_en": u"<< subtitle_en|default(subtitle)|replace('\"', "&quot;") >>",
 
   "Short_Description_de": u"",
   "Short_Description_en": u"",
@@ -8,23 +10,45 @@
   "Description_de": u'''<p></p>''',
   "Description_en": u'''<p></p>''',
   
-#  "instrumentation": u"",
+  #"instrumentation": u"",
 
   "Category": u"",
 
+  #"composer": u"<<composer>>",
+  #"composerdate": u"<<composerdate>>",
+  #"title": u"<<title>",
+  #"subtitle": u"<<subtitle>",
+  #"opus": u"<<opus>>",
+  #"arranger": u"<<arranger>>",
+  #"arrangerdate": u"<<arrangerdate>>",
+  #"poet": u"<<poet>>",
+  #"poetdate": u"<<poetdate>>",
+  #"instrumentation": u"<<instrumentation>>",
+  #"key": u"<<key>>",
+  #"editor": u"<<editor>>",
+  #"publisher": u"<<publisher>>",
+  #"language": u"<<language>>",
+  #"duration": u"<<duration>>",
+  #"composition_year": u"<<composition_year>>",
+  #"score_information": u"<<score_information>>",
+  #"genre": u"<<genre>>",
+  
   #"published": "Y",
 
+  #"price": 100.00,
+  #"currency": "EUR",
+ 
   "Child_Products": [
-#   {"sku": "...", "ismn": "...", "type": "Overrides SCORETYPE", "type_en": "English TYPE", "comment": "COMMENT to be displayed", "price": "..."},
+    # {"sku": "...", "ismn": "...", "type": "Overrides SCORETYPE", "type_en": "English TYPE", "comment": "COMMENT to be displayed", "price": "..."},
 <$- for e in webshop_editions $>
-    {"sku": u"<< e.sku >>", "ismn": u"<<e.ismn>>", "comment": u"<<e.comment>>", "price": <<e.price|default(0.00)>>}, # << e.type >>
+    {"sku": u"<< e.sku >>", "ismn": u"<<e.ismn>>", "comment": u"<<e.comment|replace('\"', "&quot;") >>", "price": <<e.price|default(0.00)>>}, # << e.type >>
 <$- endfor $>
   ],
   "Productimages": [
-#    "FILENAME.png",
+    # "FILENAME.png",
   ],
   "Downloadfiles": [
-#    {"filename": u"out/INFILENAME.pdf", "outname": u"OUTFILENAME.pdf", "title": u"COMPOSER: WORK, DISPLAYED DOWNLOADTITLE", "desc": u"..."}, 
-#   "out/FILENAME.pdf",
+    # {"filename": u"out/INFILENAME.pdf", "outname": u"OUTFILENAME.pdf", "title": u"COMPOSER: WORK, DISPLAYED DOWNLOADTITLE", "desc": u"..."}, 
+    # "out/FILENAME.pdf",
   ]
 }