Handlebars.registerHelper('cedar', function(options) {
  "use strict";

  var hashCode = function(string) {
    var hash = 0;
    if (string.length == 0) return hash;
    for (var i = 0; i < string.length; i++) {
      var character = string.charCodeAt(i);
      hash = ((hash << 5) - hash) + character;
      hash = hash & hash; // Convert to 32bit integer
    }
    return hash;
  };

  var unescapeHtml = function(string) {
    var MAP = {
      '&amp;': '&',
      '&lt;': '<',
      '&gt;': '>',
      '&quot;': '"',
      '&#39;': "'",
      '&#x27;': "'"
    };

    return string.replace(/&#?\w+;/g, function(c) {
      return MAP[c];
    });
  };

  options.el = document.createElement("span");
  options.el.id = "cedar-js-" + hashCode(options.hash.id);

  new Cedar.ContentEntry({ cedarId: options.hash.id }).retrieve().then(function(contentEntry){

    var domEl = document.getElementById(options.el.id);
    if (domEl === null) {
      domEl = options.el;
    }

    if (typeof options.fn === "undefined") { // If using inline-style helper
      domEl.innerHTML = contentEntry.getContent();
    } else if (typeof options.fn === "function") { // If using block-style helper
      var output = '';
      if (Cedar.auth.isEditMode()) {
        output += contentEntry.getEditOpen();
      }
      output += unescapeHtml(options.fn(contentEntry.toJSON()));
      if (Cedar.auth.isEditMode()) {
        output += contentEntry.getEditClose();
      }
      domEl.innerHTML = output;
    }
  });

  return new Handlebars.SafeString(options.el.outerHTML);
});

Handlebars.registerHelper('cedar', function(options) {
  "use strict";

  var hashCode = function(string) {
    var hash = 0;
    if (string.length == 0) return hash;
    for (var i = 0; i < string.length; i++) {
      var character = string.charCodeAt(i);
      hash = ((hash << 5) - hash) + character;
      hash = hash & hash; // Convert to 32bit integer
    }
    return hash;
  };

  var unescapeHtml = function(string) {
    var MAP = {
      '&amp;': '&',
      '&lt;': '<',
      '&gt;': '>',
      '&quot;': '"',
      '&#39;': "'",
      '&#x27;': "'"
    };

    return string.replace(/&#?\w+;/g, function(c) {
      return MAP[c];
    });
  };

  options.el = document.createElement("div");
  options.el.setAttribute("style", "display: inline");
  options.el.id = "cedar-js-" + hashCode(options.hash.id);

  new Cedar.ContentEntry({ cedarId: options.hash.id }).retrieve().then(function(contentEntry){

    var domEl = document.getElementById(options.el.id);
    if (domEl === null) {
      domEl = options.el;
    }

    if (typeof options.fn === "undefined") { // If using inline-style helper
      domEl.innerHTML = contentEntry.getContent();
    } else if (typeof options.fn === "function") { // If using block-style helper
      var output = '';
      if (Cedar.auth.isEditMode()) {
        output += contentEntry.getEditOpen();
      }
      output += unescapeHtml(options.fn(contentEntry.toJSON()));
      if (Cedar.auth.isEditMode()) {
        output += contentEntry.getEditClose();
      }
      domEl.innerHTML = output;
    }
  });

  return new Handlebars.SafeString(options.el.outerHTML);
});

Change span to div