fix to markup to change @class to @type for <span>