diff --git a/superset/assets/javascripts/explorev2/components/ChartContainer.jsx b/superset/assets/javascripts/explorev2/components/ChartContainer.jsx
index 33b134e9da7..c914cf55f89 100644
--- a/superset/assets/javascripts/explorev2/components/ChartContainer.jsx
+++ b/superset/assets/javascripts/explorev2/components/ChartContainer.jsx
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import Mustache from 'mustache';
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { Alert, Collapse, Label, Panel } from 'react-bootstrap';
@@ -104,6 +105,14 @@ class ChartContainer extends React.PureComponent {
 
       height: getHeight,
 
+      render_template: function (s) {
+        const context = {
+          width: this.width,
+          height: this.height,
+        };
+        return Mustache.render(s, context);
+      },
+
       setFilter: () => {},
 
       getFilters: () => (
diff --git a/superset/assets/javascripts/explorev2/stores/controls.jsx b/superset/assets/javascripts/explorev2/stores/controls.jsx
index f5267662d8e..59028bb463a 100644
--- a/superset/assets/javascripts/explorev2/stores/controls.jsx
+++ b/superset/assets/javascripts/explorev2/stores/controls.jsx
@@ -655,7 +655,7 @@ export const controls = {
     label: 'URL',
     description: 'The URL, this control is templated, so you can integrate ' +
                  '{{ width }} and/or {{ height }} in your URL string.',
-    default: 'https: //www.youtube.com/embed/JkI5rg_VcQ4',
+    default: 'https://www.youtube.com/embed/AdSZJzb-aX8',
   },
 
   x_axis_label: {
diff --git a/superset/assets/javascripts/modules/superset.js b/superset/assets/javascripts/modules/superset.js
index 35bdd499cb0..6076875dec2 100644
--- a/superset/assets/javascripts/modules/superset.js
+++ b/superset/assets/javascripts/modules/superset.js
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-const Mustache = require('mustache');
 const utils = require('./utils');
 // vis sources
 /* eslint camel-case: 0 */
+import Mustache from 'mustache';
 import vizMap from '../../visualizations/main.js';
 import { getExploreUrl } from '../explorev2/exploreUtils';
 import { applyDefaultFormData } from '../explorev2/stores/store';