diff --git a/src/code_manager/model/HtmlGenerator.js b/src/code_manager/model/HtmlGenerator.js
index fbfb0fd4f..7df04e637 100644
--- a/src/code_manager/model/HtmlGenerator.js
+++ b/src/code_manager/model/HtmlGenerator.js
@@ -1,6 +1,6 @@
-import Backbone from 'backbone';
+import { Model } from 'backbone';
 
-export default Backbone.Model.extend({
+export default class HTMLGenerator extends Model {
   build(model, opts = {}) {
     const models = model.components();
     const htmlOpts = {};
@@ -36,16 +36,16 @@ export default Backbone.Model.extend({
     if (opts.exportWrapper) {
       return model.toHTML({
         ...htmlOpts,
-        ...(opts.wrapperIsBody && { tag: 'body' })
+        ...(opts.wrapperIsBody && model.is('wrapper') && { tag: 'body' })
       });
     }
 
     return this.buildModels(models, htmlOpts);
-  },
+  }
 
   buildModels(models, opts = {}) {
     let code = '';
     models.forEach(mod => (code += mod.toHTML(opts)));
     return code;
   }
-});
+}
diff --git a/src/editor/index.js b/src/editor/index.js
index 409f2797c..91c9270d2 100644
--- a/src/editor/index.js
+++ b/src/editor/index.js
@@ -211,6 +211,7 @@ export default (config = {}) => {
      * Returns HTML built inside canvas
      * @param {Object} [opts={}] Options
      * @param {Boolean} [opts.cleanId=false] Remove unnecessary IDs (eg. those created automatically)
+     * @param {Component} [opts.component] Return the HTML of a specific Component
      * @returns {string} HTML string
      */
     getHtml(opts) {