diff --git a/web/includes/functions.php b/web/includes/functions.php
index 7c18d59a2..74af48f44 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -39,7 +39,7 @@ function CSPHeaders($view, $nonce) {
   global $Servers;
   if ( ! $Servers )
     $Servers = ZM\Server::find();
-  
+
   $additionalScriptSrc = implode(' ', array_map(function($S){return $S->Url();}, $Servers));
   switch ($view) {
     case 'login': {
@@ -47,7 +47,7 @@ function CSPHeaders($view, $nonce) {
           && defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY')
           && defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
           && ZM_OPT_USE_GOOG_RECAPTCHA && ZM_OPT_GOOG_RECAPTCHA_SITEKEY && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY) {
-        $additionalScriptSrc = ' https://www.google.com';
+        $additionalScriptSrc .= ' https://www.google.com';
       }
       // fall through
     }
@@ -2194,7 +2194,6 @@ function ajaxError($message, $code=HTTP_STATUS_OK) {
   if ( $code == HTTP_STATUS_OK ) {
     $response = array('result'=>'Error', 'message'=>$message);
     header('Content-type: application/json');
-    #header('Content-type: text/plain');
     exit(jsonEncode($response));
   }
   header("HTTP/1.0 $code $message");
@@ -2211,7 +2210,6 @@ function ajaxResponse($result=false) {
     $response['message'] = $result;
   }
   header('Content-type: application/json');
-  #header('Content-type: text/plain');
   exit(jsonEncode($response));
 }
 
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index d6a51732e..e04ce8f68 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -173,19 +173,19 @@ if ( $showZones ) {
 
           <span id="widthControl">
             <label><?php echo translate('Width') ?></label>
-            <?php echo htmlSelect('width', $widths, $options['width'], 'changeSize(this);'); ?>
+            <?php echo htmlSelect('width', $widths, $options['width'], array('data-on-change-this'=>'changeSize')); ?>
           </span>
           <span id="heightControl">
             <label><?php echo translate('Height') ?></label>
-            <?php echo htmlSelect('height', $heights, $options['height'], 'changeSize(this);'); ?>
+            <?php echo htmlSelect('height', $heights, $options['height'], array('data-on-change-this'=>'changeSize')); ?>
           </span>
           <span id="scaleControl">
             <label><?php echo translate('Scale') ?></label>
-            <?php echo htmlSelect('scale', $scales, $scale, 'changeScale(this);'); ?>
+            <?php echo htmlSelect('scale', $scales, $scale, array('data-on-change-this'=>'changeScale')); ?>
           </span> 
           <span id="layoutControl">
             <label for="layout"><?php echo translate('Layout') ?></label>
-            <?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('onchange'=>'selectLayout(this);')); ?>
+            <?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('data-on-change-this'=>'selectLayout')); ?>
           </span>
           <input type="hidden" name="Positions"/>
           <button type="button" id="EditLayout" data-on-click-this="edit_layout"><?php echo translate('EditLayout') ?></button>