diff --git a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Data.jsx b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Data.jsx
index 5e75da48..f4bd8580 100644
--- a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Data.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Data.jsx
@@ -43,7 +43,7 @@ const CategoricalFilter = ({ value, index, items, onUpdateFilterValue }) => {
             */
             return a.position - b.position
         });
-        return sortedItems.map(v => <PanelRow> <ToggleControl label={v.value} checked={value.indexOf(v.id) > -1}
+        return sortedItems.map(v => <PanelRow key={v.id} style={{ alignItems: 'flex-start' }}> <ToggleControl label={<span style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>{v.value}</span>} checked={value.indexOf(v.id) > -1}
             onChange={e => {
                 onUpdateFilterValue(v.id, index)
             }} /></PanelRow>)
@@ -230,6 +230,7 @@ export class DataLayerSetting extends Component {
                 filters,
                 featureJoinAttribute,
                 apiJoinAttribute,
+                extraTooltipColumns = [],
                 type,
                 useCentroidPoint,
                 useBreaks,
@@ -343,6 +344,38 @@ export class DataLayerSetting extends Component {
                     options={allDimensions}
                 />
             </PanelRow>}
+            <PanelRow>
+                 <React.Fragment>
+                    {app !== 'csv' && <PanelBody initialOpen={false} title={__("Extra Tooltip Columns")}>
+                        <PanelRow>
+                            <p style={{
+                                fontSize: "12px",
+                                fontStyle: "italic",
+                                color: "#666",
+                                margin: "0",
+                            }}>
+                                {__("Additional fields to expose as tooltip variables, without adding them as dimensions.")}
+                            </p>
+                        </PanelRow>
+                        {allDimensions && allDimensions.filter(d => d.value !== 'none'
+                            && d.value !== apiJoinAttribute && d.value !== patternDiscriminator).map(d => (
+                                <PanelRow key={d.value} style={{ alignItems: 'flex-start' }}>
+                                    <CheckboxControl
+                                        label={<span style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>{d.label}</span>}
+                                        checked={extraTooltipColumns.indexOf(d.value) > -1}
+                                        onChange={(checked) => {
+                                            const newValue = checked
+                                                ? [...extraTooltipColumns, d.value]
+                                                : extraTooltipColumns.filter(v => v !== d.value);
+                                            onChangeProperty("extraTooltipColumns", newValue)
+                                        }}
+                                    />
+                                </PanelRow>
+                            ))}
+
+                    </PanelBody>}
+                </React.Fragment>
+            </PanelRow>
             <PanelRow>
                 <TextareaControl
                     label={__("Tooltip")}
@@ -360,7 +393,18 @@ export class DataLayerSetting extends Component {
                     "font-style": "normal",
                     "color": "rgb(117, 117, 117)"
                 }}>{"{" + m.value + "}"}</p></PanelRow>)}
+            {extraTooltipColumns && extraTooltipColumns.length > 0 && extraTooltipColumns.map(col => {
+                const dim = allDimensions ? allDimensions.find(d => d.value === col) : null
+                return (<PanelRow key={col}><p
+                    style={{
+                        "margin-top": "calc(8px)",
+                        "font-size": "12px",
+                        "font-style": "normal",
+                        "color": "rgb(117, 117, 117)"
+                    }}>{(dim ? dim.label : col) + ": " + "{" + col + "}"}</p></PanelRow>)
+            })}
         </PanelBody>,
+
         <React.Fragment>
             {app != 'csv' && <Measures
                 onFormatChange={this.onFormatChange}
diff --git a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Flow.jsx b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Flow.jsx
index bacd78d7..f0f07eb6 100644
--- a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Flow.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Flow.jsx
@@ -41,7 +41,7 @@ const CategoricalFilter = ({ value, index, items, onUpdateFilterValue }) => {
             */
             return a.position - b.position
         });
-        return sortedItems.map(v => <PanelRow> <ToggleControl label={v.value} checked={value.indexOf(v.id) > -1}
+        return sortedItems.map(v => <PanelRow key={v.id} style={{ alignItems: 'flex-start' }}> <ToggleControl label={<span style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>{v.value}</span>} checked={value.indexOf(v.id) > -1}
             onChange={e => {
                 onUpdateFilterValue(v.id, index)
             }} /></PanelRow>)
@@ -214,6 +214,7 @@ export class DataLayerSetting extends Component {
                 filters,
                 featureJoinAttribute,
                 apiJoinAttribute,
+                extraTooltipColumns = [],
                 type,
                 useCentroidPoint,
                 useBreaks,
@@ -363,6 +364,45 @@ export class DataLayerSetting extends Component {
                 </div>
             </PanelRow>
         </PanelBody>,
+        <React.Fragment>
+            {app != 'csv' && <PanelBody initialOpen={false} title={__("Extra Tooltip Columns")}>
+                <PanelRow>
+                    <p style={{
+                        fontSize: "12px",
+                        fontStyle: "italic",
+                        color: "#666",
+                        margin: "0",
+                    }}>
+                        {__("Additional fields to expose as tooltip variables, without adding them as dimensions.")}
+                    </p>
+                </PanelRow>
+                {allDimensions && allDimensions.filter(d => d.value !== 'none'
+                    && d.value !== flowOrigin && d.value !== flowDestination).map(d => (
+                    <PanelRow key={d.value} style={{ alignItems: 'flex-start' }}>
+                        <CheckboxControl
+                            label={<span style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>{d.label}</span>}
+                            checked={extraTooltipColumns.indexOf(d.value) > -1}
+                            onChange={(checked) => {
+                                const newValue = checked
+                                    ? [...extraTooltipColumns, d.value]
+                                    : extraTooltipColumns.filter(v => v !== d.value);
+                                onChangeProperty("extraTooltipColumns", newValue)
+                            }}
+                        />
+                    </PanelRow>
+                ))}
+                {extraTooltipColumns && extraTooltipColumns.length > 0 && extraTooltipColumns.map(col => {
+                    const dim = allDimensions ? allDimensions.find(d => d.value === col) : null
+                    return (<PanelRow key={col}><p
+                        style={{
+                            "margin-top": "calc(8px)",
+                            "font-size": "12px",
+                            "font-style": "normal",
+                            "color": "rgb(117, 117, 117)"
+                        }}>{(dim ? dim.label : col) + ": " + "{" + col + "}"}</p></PanelRow>)
+                })}
+            </PanelBody>}
+        </React.Fragment>,
         <React.Fragment>
             {app != 'csv' && <Measures
                 onFormatChange={this.onFormatChange}
diff --git a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/LatLong.jsx b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/LatLong.jsx
index b0a2761c..7cdf51fa 100644
--- a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/LatLong.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/LatLong.jsx
@@ -203,6 +203,7 @@ export class DataLayerSetting extends Component {
                 format,
                 featureJoinAttribute,
                 apiJoinAttribute,
+                extraTooltipColumns = [],
                 dimension1,
                 type,
                 useCentroidPoint,
@@ -288,6 +289,39 @@ export class DataLayerSetting extends Component {
                 </>
             }
 
+            <PanelRow>
+                <React.Fragment>
+                    {app != 'csv' && <PanelBody initialOpen={false} title={__("Extra Tooltip Columns")}>
+                        <PanelRow>
+                            <p style={{
+                                fontSize: "12px",
+                                fontStyle: "italic",
+                                color: "#666",
+                                margin: "0",
+                            }}>
+                                {__("Additional fields to expose as tooltip variables, without adding them as dimensions.")}
+                            </p>
+                        </PanelRow>
+                        {allDimensions && allDimensions.filter(d => d.value !== 'none'
+                            && d.value !== apiJoinAttribute && d.value !== dimension2).map(d => (
+                                <PanelRow key={d.value} style={{ alignItems: 'flex-start' }}>
+                                    <CheckboxControl
+                                        label={<span style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>{d.label}</span>}
+                                        checked={extraTooltipColumns.indexOf(d.value) > -1}
+                                        onChange={(checked) => {
+                                            const newValue = checked
+                                                ? [...extraTooltipColumns, d.value]
+                                                : extraTooltipColumns.filter(v => v !== d.value);
+                                            onChangeProperty("extraTooltipColumns", newValue)
+                                        }}
+                                    />
+                                </PanelRow>
+                            ))}
+
+                    </PanelBody>}
+                </React.Fragment>
+            </PanelRow>
+
             <PanelRow>
                 <TextareaControl
                     label={__("Tooltip")}
@@ -314,6 +348,17 @@ export class DataLayerSetting extends Component {
                     "color": "rgb(117, 117, 117)"
                 }}>{"{" + dimension2 + "}"}</p></PanelRow>
             }
+
+            {extraTooltipColumns && extraTooltipColumns.length > 0 && extraTooltipColumns.map(col => {
+                const dim = allDimensions ? allDimensions.find(d => d.value === col) : null
+                return (<PanelRow key={col}><p
+                    style={{
+                        "margin-top": "calc(8px)",
+                        "font-size": "12px",
+                        "font-style": "normal",
+                        "color": "rgb(117, 117, 117)"
+                    }}>{(dim ? dim.label : col) + ": " + "{" + col + "}"}</p></PanelRow>)
+            })}
         </PanelBody>,
         <React.Fragment>
             {app != 'csv' && <PanelBody initialOpen={false} title={__("Filters")}>
diff --git a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Model.js b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Model.js
index a89e57ba..aa12e6d3 100644
--- a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Model.js
+++ b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Model.js
@@ -54,6 +54,7 @@ export const Model = {
     },
     featureJoinAttribute: 'none',
     apiJoinAttribute: 'none',
+    extraTooltipColumns: [],
     useCentroidPoint: true,
     patternDiscriminator: 'none',
     patternDiscriminatorLabel: null,
diff --git a/plugins/wp-react-blocks-plugin/blocks/map/Tooltips.js b/plugins/wp-react-blocks-plugin/blocks/map/Tooltips.js
index 8ff4a520..6e58cc49 100644
--- a/plugins/wp-react-blocks-plugin/blocks/map/Tooltips.js
+++ b/plugins/wp-react-blocks-plugin/blocks/map/Tooltips.js
@@ -293,10 +293,11 @@ export default class Tooltips extends Component {
                     )}
                   </p>
                 </PanelRow>
-                {allDimensions && allDimensions.filter(d => d.value !== 'none').map((d) => (
-                  <PanelRow key={d.value}>
+                {allDimensions && allDimensions.filter(d => d.value !== 'none'
+                  && d.value !== dimension1 && d.value !== dimension2 && d.value !== dimension3).map((d) => (
+                  <PanelRow key={d.value} style={{ alignItems: 'flex-start' }}>
                     <CheckboxControl
-                      label={d.label}
+                      label={<span style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>{d.label}</span>}
                       checked={extraTooltipColumns.indexOf(d.value) > -1}
                       onChange={(checked) => {
                         const newValue = checked