diff --git a/js/tabularfieldsselector.js b/js/tabularfieldsselector.js
index 4eb775083..96ecdc378 100644
--- a/js/tabularfieldsselector.js
+++ b/js/tabularfieldsselector.js
@@ -147,7 +147,8 @@ $(function () {
 					me._mark_as_selected($(this).val(), bChecked);
 				});
 				jSelector.find('.tfs_checkbox_multi').each(function () {
-					var oField = me._get_main_field_by_code($(this).val());
+					var sMultiFieldCode = $(this).val();
+					var oField = me._get_main_field_by_code(sMultiFieldCode);
 					if (oField != null) {
 						$(this).prop('checked', bChecked);
 						$(this).prop('indeterminate', false);
@@ -158,6 +159,7 @@ $(function () {
 							sElementId = (sPrefix+oField.subattr[k].code).replace('.', '_');
 							$(sElementId).prop('checked', bChecked);
 						}
+						me._update_tooltips(sMultiFieldCode);
 					}
 				});
 				this._update_holder();
diff --git a/js/utils.js b/js/utils.js
index ff825f523..268a42833 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -388,11 +388,23 @@ function ExportListDlg(sOQL, sDataTableId, sFormat, sDlgTitle) {
 		var sDataTableName = 'datatable_'+sDataTableId;
 		var oColumns = $('#'+sDataTableName).DataTable().ajax.params()['columns'];
 		for (var j in oColumns) {
-			var sCode = oColumns[j]['data'].split("/");
-			if (sCode[1] == '_key_') {
-				sCode[1] = 'id';
+			if (oColumns[j]['data']) {
+				var sCode = oColumns[j]['data'].split("/");
+				if (sCode[1] == '_key_') {
+					sCode[1] = 'id';
+				}
+				aFields.push(sCode[0]+'.'+sCode[1]);
+			} else {
+				for (var k in oColumns[j]) {
+					if (oColumns[j][k].checked) {
+						var sCode = oColumns[j][k].code;
+						if (sCode == '_key_') {
+							sCode = 'id';
+						}
+						aFields.push(j+'.'+sCode);
+					}
+				}
 			}
-			aFields.push(sCode[0]+'.'+sCode[1]);
 		}
 	}