diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index aff82fcdbc..f61455ff3c 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -2328,7 +2328,11 @@ define([
             }
             if (str.length>100)
                 str = str.substring(0, 100) + '...';
-            str = "<b>" + (Common.Utils.String.htmlEncode(props.asc_getColumnName()) || '(' + this.txtColumn + ' ' + Common.Utils.String.htmlEncode(props.asc_getSheetColumnName()) + ')') + ":</b><br>" + str;
+            var colName = props.asc_getColumnName();
+            colName && (colName = colName.replace(/\n/g, ' '));
+            if (colName.length>100)
+                colName = colName.substring(0, 100) + '...';
+            str = "<b>" + (Common.Utils.String.htmlEncode(colName) || '(' + this.txtColumn + ' ' + Common.Utils.String.htmlEncode(props.asc_getSheetColumnName()) + ')') + ":</b><br>" + str;
             return str;
         },
 
diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettings.js b/apps/spreadsheeteditor/main/app/view/PivotSettings.js
index f1966c9e2c..f874c1617a 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotSettings.js
@@ -891,19 +891,20 @@ define([
         onMoveTo: function(type, pivotindex, to) {
             if (this.api && !this._locked && this._state.field){
                 var pivotIndex = _.isNumber(pivotindex) ? pivotindex : this._state.field.record.get('pivotIndex'),
-                    index = _.isNumber(to) ? to : ((this._state.field.type==2) ? this._state.field.record.get('index') : undefined);
+                    index = _.isNumber(to) ? to : undefined,
+                    dataIndex = (this._state.field.type==2) ? this._state.field.record.get('index') : undefined;
                 switch (type) {
                     case 0:
-                        this._originalProps.asc_moveToColField(this.api, pivotIndex, index);
+                        this._originalProps.asc_moveToColField(this.api, pivotIndex, dataIndex, index);
                         break;
                     case 1:
-                        this._originalProps.asc_moveToRowField(this.api, pivotIndex, index);
+                        this._originalProps.asc_moveToRowField(this.api, pivotIndex, dataIndex, index);
                         break;
                     case 2:
-                        this._originalProps.asc_moveToDataField(this.api, pivotIndex, index);
+                        this._originalProps.asc_moveToDataField(this.api, pivotIndex, dataIndex, index);
                         break;
                     case 3:
-                        this._originalProps.asc_moveToPageField(this.api, pivotIndex, index);
+                        this._originalProps.asc_moveToPageField(this.api, pivotIndex, dataIndex, index);
                         break;
                 }
                 Common.NotificationCenter.trigger('edit:complete', this);