diff --git a/apps/documenteditor/main/app/view/CrossReferenceDialog.js b/apps/documenteditor/main/app/view/CrossReferenceDialog.js
index 54f46b750..5cb66b21e 100644
--- a/apps/documenteditor/main/app/view/CrossReferenceDialog.js
+++ b/apps/documenteditor/main/app/view/CrossReferenceDialog.js
@@ -203,8 +203,7 @@ define([
 
             var me = this;
             var onApiEndCalculate = function() {
-                var rec = me.cmbType.getSelectedRecord();
-                rec && me.refreshReferences(rec.value);
+                me.refreshReferences(me.cmbType.getSelectedRecord());
             };
             this.api.asc_registerCallback('asc_onEndCalculate', onApiEndCalculate);
             this.on('close', function(obj){
@@ -288,7 +287,7 @@ define([
 
         refreshReferenceTypes: function(record, currentRef) {
             var arr = [],
-                str = this.textWhich, type = 5;
+                str = this.textWhich;
             if (record.type==1 || record.value > 4) {
                 // custom labels from caption dialog and Equation, Figure, Table
                 arr = [
@@ -299,7 +298,6 @@ define([
                     { value: Asc.c_oAscDocumentRefenceToType.AboveBelow, displayValue: this.textAboveBelow }
                 ];
             } else {
-                type = record.value;
                 switch (record.value) {
                     case 0: // paragraph
                         arr = [
@@ -360,11 +358,14 @@ define([
             this.cmbReference.setValue(rec ? currentRef : arr[0].value);
             this.onReferenceSelected(this.cmbReference, this.cmbReference.getSelectedRecord());
             this.lblWhich.text(str);
-            this.refreshReferences(type);
+            this.refreshReferences(record);
         },
 
-        refreshReferences: function(type) {
+        refreshReferences: function(record) {
+            if (!record) return;
+
             var store = this.refList.store,
+                type = (record.type==1 || record.value > 4) ? 5 : record.value,
                 arr = [],
                 props;
             switch (type) {
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index f2d676dd1..e095f2f35 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -1085,7 +1085,7 @@ define([
                         if (linkstr) {
                             linkstr = Common.Utils.String.htmlEncode(linkstr) + '<br><b>' + me.textCtrlClick + '</b>';
                         } else {
-                            linkstr = props.asc_getHyperlinkUrl() + '<br><b>' + me.textCtrlClick + '</b>';
+                            linkstr = Common.Utils.String.htmlEncode(props.asc_getHyperlinkUrl()) + '<br><b>' + me.textCtrlClick + '</b>';
                         }
                     } else {
                         linkstr = Common.Utils.String.htmlEncode(props.asc_getTooltip() || (props.asc_getLocation()));