diff --git a/addons/website/view.py b/addons/website/view.py
index 35ce83043f9..deb05987759 100644
--- a/addons/website/view.py
+++ b/addons/website/view.py
@@ -59,7 +59,8 @@ class view(osv.osv):
         embedded_id = int(el.get('data-oe-id'))
         # FIXME: type conversions
         self.pool[el.get('data-oe-model')].write(cr, uid, embedded_id, {
-            el.get('data-oe-field'): el.text
+            # FIXME: ckeditor parser does not follow HTML5 parsing, breaks block-level links
+            el.get('data-oe-field'): el.text_content()
         }, context=context)
 
     def to_field_ref(self, cr, uid, el, context=None):
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index beac1ee0398..15c185dfb6a 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -134,7 +134,7 @@
                         <t t-call="website.publish"><t t-set="object" t-value="product"/></t>
                         <div class="ellipsis css_content">
                             <a t-attf-href="/shop/product/#{ product.id }/?#{ search and ('search=%s' % search) or ''}#{ category_id and ('&amp;category_id=%s' % category_id) or ''}" style="text-decoration: none; display: block;">
-                                <h5 t-field="product.name"> </h5>
+                                <h5 t-field="product.name"/>
                                 <img class="img-rounded" t-att-src="product.img('image_small')"/>
                             </a>
                             <small t-field="product.description_sale"/>