diff --git a/customize.dist/src/less2/include/markdown.less b/customize.dist/src/less2/include/markdown.less
index 1bd592d63..7a8fc0ddf 100644
--- a/customize.dist/src/less2/include/markdown.less
+++ b/customize.dist/src/less2/include/markdown.less
@@ -1,3 +1,5 @@
+@import (reference) "./tools.less";
+
 .markdown_main() {
     blockquote {
         background: #e5e5e5;
@@ -95,6 +97,7 @@
         svg {
             max-width: 100%;
             cursor: pointer;
+            .tools_unselectable();
         }
     }
 }
diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index adba02656..fc9c4046c 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -447,7 +447,9 @@ define([
                     idx = 0;
                 }
 
-                common.getMediaTagPreview(mts, idx);
+                setTimeout(function () {
+                    common.getMediaTagPreview(mts, idx);
+                });
             };
         };
 
@@ -465,10 +467,10 @@ define([
                     contextMenu.show(e);
                 });
                 if ($mt.children().length) {
-                    $mt.off('dblclick preview');
+                    $mt.off('click dblclick preview');
                     $mt.on('preview', onPreview($mt));
                     if ($mt.find('img').length) {
-                        $mt.on('dblclick', function () {
+                        $mt.on('click dblclick', function () {
                             $mt.trigger('preview');
                         });
                     }
@@ -485,10 +487,10 @@ define([
                             observer.disconnect();
                         }
                     });
-                    $mt.off('dblclick preview');
+                    $mt.off('click dblclick preview');
                     $mt.on('preview', onPreview($mt));
                     if ($mt.find('img').length) {
-                        $mt.on('dblclick', function () {
+                        $mt.on('click dblclick', function () {
                             $mt.trigger('preview');
                         });
                     }
@@ -518,9 +520,9 @@ define([
                     $(contextMenu.menu).find('li:not(.cp-svg)').hide();
                     contextMenu.show(e);
                 });
-                $el.off('dblclick preview');
+                $el.off('dblclick click preview');
                 $el.on('preview', onPreview($el));
-                $el.on('dblclick', function () {
+                $el.on('dblclick click', function () {
                     $el.trigger('preview');
                 });
 
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 3e1f2e75b..295d8b6b5 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -256,11 +256,9 @@ define([
                 $inner.append(cfg.svg);
                 if (!cfg.render) {
                     $spinner.hide();
-                    console.error('here');
                     locked = false;
                     return;
                 }
-                console.error('there');
                 setTimeout(cfg.render);
                 tag = cfg.svg;
             } else {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 681701129..8c30f2886 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1003,6 +1003,7 @@ define([
                         if (typeof(SecureModal.cb) !== "function") { return; }
                         SecureModal.cb(data);
                     };
+                    config.onFileUpload = onFileUpload;
                     config.onClose = function () {
                         SecureModal.$iframe.hide();
                     };