diff --git a/src/__demo__/data/event/boolean.data.hidena.json b/src/__demo__/data/event/boolean.data.hidena.json
index 3cb146c90..627ab7ad4 100644
--- a/src/__demo__/data/event/boolean.data.hidena.json
+++ b/src/__demo__/data/event/boolean.data.hidena.json
@@ -77,6 +77,13 @@
             "A03MvHHogjR": {
                 "name": "Birth"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "A03MvHHogjR.bx6fsa0t90x_0": {
                 "name": "No"
             },
diff --git a/src/__demo__/data/event/boolean.data.json b/src/__demo__/data/event/boolean.data.json
index 6d48278b1..7b9b701bd 100644
--- a/src/__demo__/data/event/boolean.data.json
+++ b/src/__demo__/data/event/boolean.data.json
@@ -77,20 +77,18 @@
             "A03MvHHogjR": {
                 "name": "Birth"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "A03MvHHogjR.bx6fsa0t90x_0": {
                 "name": "No"
             },
             "A03MvHHogjR.bx6fsa0t90x_1": {
                 "name": "Yes"
-            },
-            "": {
-                "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
-                }
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/date.data.hidena.json b/src/__demo__/data/event/date.data.hidena.json
index e86f3fc07..69ad21823 100644
--- a/src/__demo__/data/event/date.data.hidena.json
+++ b/src/__demo__/data/event/date.data.hidena.json
@@ -86,32 +86,39 @@
             "pe": {
                 "name": "Period"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
+            "jfuXZB3A1ko.RldgRedJrco_1992-03-20 00:00:00.0": {
+                "name": "1992-03-20"
+            },
             "jfuXZB3A1ko.RldgRedJrco_1992-05-04 00:00:00.0": {
                 "name": "1992-05-04"
             },
-            "jfuXZB3A1ko.RldgRedJrco_1994-01-02 00:00:00.0": {
-                "name": "1994-01-02"
-            },
             "jfuXZB3A1ko.RldgRedJrco_1992-08-28 00:00:00.0": {
                 "name": "1992-08-28"
             },
-            "jfuXZB3A1ko.RldgRedJrco_1993-12-01 00:00:00.0": {
-                "name": "1993-12-01"
-            },
             "jfuXZB3A1ko.RldgRedJrco_1992-11-12 00:00:00.0": {
                 "name": "1992-11-12"
             },
-            "jfuXZB3A1ko.RldgRedJrco_1992-03-20 00:00:00.0": {
-                "name": "1992-03-20"
+            "jfuXZB3A1ko.RldgRedJrco_1993-05-20 00:00:00.0": {
+                "name": "1993-05-20"
             },
             "jfuXZB3A1ko.RldgRedJrco_1993-05-21 00:00:00.0": {
                 "name": "1993-05-21"
             },
-            "jfuXZB3A1ko.RldgRedJrco_1993-05-20 00:00:00.0": {
-                "name": "1993-05-20"
+            "jfuXZB3A1ko.RldgRedJrco_1993-12-01 00:00:00.0": {
+                "name": "1993-12-01"
             },
             "jfuXZB3A1ko.RldgRedJrco_1993-12-02 00:00:00.0": {
                 "name": "1993-12-02"
+            },
+            "jfuXZB3A1ko.RldgRedJrco_1994-01-02 00:00:00.0": {
+                "name": "1994-01-02"
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/date.data.json b/src/__demo__/data/event/date.data.json
index 2fa472a22..b11b5e895 100644
--- a/src/__demo__/data/event/date.data.json
+++ b/src/__demo__/data/event/date.data.json
@@ -86,41 +86,39 @@
             "pe": {
                 "name": "Period"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
+            "jfuXZB3A1ko.RldgRedJrco_1992-03-20 00:00:00.0": {
+                "name": "1992-03-20"
+            },
             "jfuXZB3A1ko.RldgRedJrco_1992-05-04 00:00:00.0": {
                 "name": "1992-05-04"
             },
-            "jfuXZB3A1ko.RldgRedJrco_1994-01-02 00:00:00.0": {
-                "name": "1994-01-02"
-            },
             "jfuXZB3A1ko.RldgRedJrco_1992-08-28 00:00:00.0": {
                 "name": "1992-08-28"
             },
-            "jfuXZB3A1ko.RldgRedJrco_1993-12-01 00:00:00.0": {
-                "name": "1993-12-01"
-            },
             "jfuXZB3A1ko.RldgRedJrco_1992-11-12 00:00:00.0": {
                 "name": "1992-11-12"
             },
-            "jfuXZB3A1ko.RldgRedJrco_1992-03-20 00:00:00.0": {
-                "name": "1992-03-20"
+            "jfuXZB3A1ko.RldgRedJrco_1993-05-20 00:00:00.0": {
+                "name": "1993-05-20"
             },
             "jfuXZB3A1ko.RldgRedJrco_1993-05-21 00:00:00.0": {
                 "name": "1993-05-21"
             },
-            "jfuXZB3A1ko.RldgRedJrco_1993-05-20 00:00:00.0": {
-                "name": "1993-05-20"
+            "jfuXZB3A1ko.RldgRedJrco_1993-12-01 00:00:00.0": {
+                "name": "1993-12-01"
             },
             "jfuXZB3A1ko.RldgRedJrco_1993-12-02 00:00:00.0": {
                 "name": "1993-12-02"
             },
-            "": {
-                "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
-                }
+            "jfuXZB3A1ko.RldgRedJrco_1994-01-02 00:00:00.0": {
+                "name": "1994-01-02"
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/datetime.data.hidena.json b/src/__demo__/data/event/datetime.data.hidena.json
index 310ea9194..5b1530102 100644
--- a/src/__demo__/data/event/datetime.data.hidena.json
+++ b/src/__demo__/data/event/datetime.data.hidena.json
@@ -65,6 +65,34 @@
             "jfuXZB3A1ko": {
                 "name": "Stage 1 - Repeatable"
             },
+            "ou": {
+                "name": "Organisation unit"
+            },
+            "J1QQtmzqhJz": {
+                "name": "E2E program"
+            },
+            "LAST_12_MONTHS": {
+                "name": "Last 12 months"
+            },
+            "ImspTQPwCqd": {
+                "name": "Sierra Leone"
+            },
+            "pe": {
+                "name": "Period"
+            },
+            "KWzx2tY8dFi": {
+                "name": "E2E - Date & Time"
+            },
+            "jfuXZB3A1ko.KWzx2tY8dFi": {
+                "name": "E2E - Date & Time"
+            },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "jfuXZB3A1ko.KWzx2tY8dFi_1990-01-24 14:50:00.0": {
                 "name": "1990-01-24 14:50"
             },
@@ -94,27 +122,6 @@
             },
             "jfuXZB3A1ko.KWzx2tY8dFi_1998-02-28 11:20:00.0": {
                 "name": "1998-02-28 11:20"
-            },
-            "ou": {
-                "name": "Organisation unit"
-            },
-            "J1QQtmzqhJz": {
-                "name": "E2E program"
-            },
-            "LAST_12_MONTHS": {
-                "name": "Last 12 months"
-            },
-            "ImspTQPwCqd": {
-                "name": "Sierra Leone"
-            },
-            "pe": {
-                "name": "Period"
-            },
-            "KWzx2tY8dFi": {
-                "name": "E2E - Date & Time"
-            },
-            "jfuXZB3A1ko.KWzx2tY8dFi": {
-                "name": "E2E - Date & Time"
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/datetime.data.json b/src/__demo__/data/event/datetime.data.json
index 4e5d58827..cd23e7b34 100644
--- a/src/__demo__/data/event/datetime.data.json
+++ b/src/__demo__/data/event/datetime.data.json
@@ -65,6 +65,34 @@
             "jfuXZB3A1ko": {
                 "name": "Stage 1 - Repeatable"
             },
+            "ou": {
+                "name": "Organisation unit"
+            },
+            "J1QQtmzqhJz": {
+                "name": "E2E program"
+            },
+            "LAST_12_MONTHS": {
+                "name": "Last 12 months"
+            },
+            "ImspTQPwCqd": {
+                "name": "Sierra Leone"
+            },
+            "pe": {
+                "name": "Period"
+            },
+            "KWzx2tY8dFi": {
+                "name": "E2E - Date & Time"
+            },
+            "jfuXZB3A1ko.KWzx2tY8dFi": {
+                "name": "E2E - Date & Time"
+            },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "jfuXZB3A1ko.KWzx2tY8dFi_1990-01-24 14:50:00.0": {
                 "name": "1990-01-24 14:50"
             },
@@ -94,36 +122,6 @@
             },
             "jfuXZB3A1ko.KWzx2tY8dFi_1998-02-28 11:20:00.0": {
                 "name": "1998-02-28 11:20"
-            },
-            "ou": {
-                "name": "Organisation unit"
-            },
-            "J1QQtmzqhJz": {
-                "name": "E2E program"
-            },
-            "LAST_12_MONTHS": {
-                "name": "Last 12 months"
-            },
-            "ImspTQPwCqd": {
-                "name": "Sierra Leone"
-            },
-            "pe": {
-                "name": "Period"
-            },
-            "KWzx2tY8dFi": {
-                "name": "E2E - Date & Time"
-            },
-            "jfuXZB3A1ko.KWzx2tY8dFi": {
-                "name": "E2E - Date & Time"
-            },
-            "": {
-                "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
-                }
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/email.data.hidena.json b/src/__demo__/data/event/email.data.hidena.json
index 11ea7f012..5dd5012a8 100644
--- a/src/__demo__/data/event/email.data.hidena.json
+++ b/src/__demo__/data/event/email.data.hidena.json
@@ -86,6 +86,13 @@
             "jfuXZB3A1ko.RUZ2EBP6HQn": {
                 "name": "E2E - Email"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "jfuXZB3A1ko.RUZ2EBP6HQn_email@address.com": {
                 "name": "email@address.com"
             },
diff --git a/src/__demo__/data/event/email.data.json b/src/__demo__/data/event/email.data.json
index 660808d92..4e169b544 100644
--- a/src/__demo__/data/event/email.data.json
+++ b/src/__demo__/data/event/email.data.json
@@ -86,6 +86,13 @@
             "jfuXZB3A1ko.RUZ2EBP6HQn": {
                 "name": "E2E - Email"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "jfuXZB3A1ko.RUZ2EBP6HQn_email@address.com": {
                 "name": "email@address.com"
             },
@@ -106,15 +113,6 @@
             },
             "jfuXZB3A1ko.RUZ2EBP6HQn_test@pmail.com": {
                 "name": "test@pmail.com"
-            },
-            "": {
-                "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
-                }
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/eventstatus.data.hidena.json b/src/__demo__/data/event/eventstatus.data.hidena.json
index 3c5631b0e..5fb825eb4 100644
--- a/src/__demo__/data/event/eventstatus.data.hidena.json
+++ b/src/__demo__/data/event/eventstatus.data.hidena.json
@@ -53,9 +53,6 @@
             "A03MvHHogjR.eventstatus": {
                 "name": "Event status"
             },
-            "A03MvHHogjR.eventstatus_ACTIVE": {
-                "name": "Active"
-            },
             "IpHINAT79UW": {
                 "name": "Child Programme"
             },
@@ -63,30 +60,30 @@
                 "name": "Baby Postnatal"
             },
             "USER_ORGUNIT": {
-                "organisationUnits": [
-                    "ImspTQPwCqd"
-                ]
+                "organisationUnits": ["ImspTQPwCqd"]
             },
             "A03MvHHogjR": {
                 "name": "Birth"
             },
             "A03MvHHogjR.ou": {
                 "name": "Organisation unit"
+            },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
+            "A03MvHHogjR.eventstatus_ACTIVE": {
+                "name": "Active"
             }
         },
         "dimensions": {
-            "A03MvHHogjR.eventdate": [
-                "202511",
-                "202512",
-                "202601"
-            ],
-            "A03MvHHogjR.eventstatus": [
-                "A03MvHHogjR.eventstatus_ACTIVE"
-            ],
+            "A03MvHHogjR.eventdate": ["202511", "202512", "202601"],
+            "A03MvHHogjR.eventstatus": ["A03MvHHogjR.eventstatus_ACTIVE"],
             "pe": [],
-            "A03MvHHogjR.ou": [
-                "ImspTQPwCqd"
-            ]
+            "A03MvHHogjR.ou": ["ImspTQPwCqd"]
         }
     },
     "rowContext": {},
@@ -94,29 +91,9 @@
     "headerWidth": 4,
     "height": 3,
     "rows": [
-        [
-            "ImspTQPwCqd",
-            "202511",
-            "A03MvHHogjR.eventstatus_ACTIVE",
-            "925"
-        ],
-        [
-            "ImspTQPwCqd",
-            "202512",
-            "A03MvHHogjR.eventstatus_ACTIVE",
-            "858"
-        ],
-        [
-            "ImspTQPwCqd",
-            "202601",
-            "A03MvHHogjR.eventstatus_ACTIVE",
-            "690"
-        ],
-        [
-            "ImspTQPwCqd",
-            "202511",
-            "",
-            "12"
-        ]
+        ["ImspTQPwCqd", "202511", "A03MvHHogjR.eventstatus_ACTIVE", "925"],
+        ["ImspTQPwCqd", "202512", "A03MvHHogjR.eventstatus_ACTIVE", "858"],
+        ["ImspTQPwCqd", "202601", "A03MvHHogjR.eventstatus_ACTIVE", "690"],
+        ["ImspTQPwCqd", "202511", "", "12"]
     ]
-}
\ No newline at end of file
+}
diff --git a/src/__demo__/data/event/eventstatus.data.json b/src/__demo__/data/event/eventstatus.data.json
index 21e306b6c..ea3b0729a 100644
--- a/src/__demo__/data/event/eventstatus.data.json
+++ b/src/__demo__/data/event/eventstatus.data.json
@@ -53,9 +53,6 @@
             "A03MvHHogjR.eventstatus": {
                 "name": "Event status"
             },
-            "A03MvHHogjR.eventstatus_ACTIVE": {
-                "name": "Active"
-            },
             "IpHINAT79UW": {
                 "name": "Child Programme"
             },
@@ -63,9 +60,7 @@
                 "name": "Baby Postnatal"
             },
             "USER_ORGUNIT": {
-                "organisationUnits": [
-                    "ImspTQPwCqd"
-                ]
+                "organisationUnits": ["ImspTQPwCqd"]
             },
             "A03MvHHogjR": {
                 "name": "Birth"
@@ -75,28 +70,20 @@
             },
             "": {
                 "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
                 }
+            },
+            "A03MvHHogjR.eventstatus_ACTIVE": {
+                "name": "Active"
             }
         },
         "dimensions": {
-            "A03MvHHogjR.eventdate": [
-                "202511",
-                "202512",
-                "202601"
-            ],
-            "A03MvHHogjR.eventstatus": [
-                "A03MvHHogjR.eventstatus_ACTIVE",
-                ""
-            ],
+            "A03MvHHogjR.eventdate": ["202511", "202512", "202601"],
+            "A03MvHHogjR.eventstatus": ["A03MvHHogjR.eventstatus_ACTIVE", ""],
             "pe": [],
-            "A03MvHHogjR.ou": [
-                "ImspTQPwCqd"
-            ]
+            "A03MvHHogjR.ou": ["ImspTQPwCqd"]
         }
     },
     "rowContext": {},
@@ -104,29 +91,9 @@
     "headerWidth": 4,
     "height": 3,
     "rows": [
-        [
-            "ImspTQPwCqd",
-            "202511",
-            "A03MvHHogjR.eventstatus_ACTIVE",
-            "925"
-        ],
-        [
-            "ImspTQPwCqd",
-            "202512",
-            "A03MvHHogjR.eventstatus_ACTIVE",
-            "858"
-        ],
-        [
-            "ImspTQPwCqd",
-            "202601",
-            "A03MvHHogjR.eventstatus_ACTIVE",
-            "690"
-        ],
-        [
-            "ImspTQPwCqd",
-            "202511",
-            "",
-            "12"
-        ]
+        ["ImspTQPwCqd", "202511", "A03MvHHogjR.eventstatus_ACTIVE", "925"],
+        ["ImspTQPwCqd", "202512", "A03MvHHogjR.eventstatus_ACTIVE", "858"],
+        ["ImspTQPwCqd", "202601", "A03MvHHogjR.eventstatus_ACTIVE", "690"],
+        ["ImspTQPwCqd", "202511", "", "12"]
     ]
-}
\ No newline at end of file
+}
diff --git a/src/__demo__/data/event/integer.data.hidena.json b/src/__demo__/data/event/integer.data.hidena.json
index a49a59de4..671cd1210 100644
--- a/src/__demo__/data/event/integer.data.hidena.json
+++ b/src/__demo__/data/event/integer.data.hidena.json
@@ -68,6 +68,13 @@
             "Zj7UnCAulEk": {
                 "name": "Inpatient morbidity and mortality"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "Zj7UnCAulEk.qrur9Dvnyt5_0": {
                 "name": "0"
             },
@@ -104,6 +111,7 @@
         },
         "dimensions": {
             "pe": ["202503", "202504", "202505"],
+            "ou": ["ImspTQPwCqd"],
             "Zj7UnCAulEk.qrur9Dvnyt5": [
                 "Zj7UnCAulEk.qrur9Dvnyt5_0",
                 "Zj7UnCAulEk.qrur9Dvnyt5_1",
@@ -116,8 +124,7 @@
                 "Zj7UnCAulEk.qrur9Dvnyt5_8",
                 "Zj7UnCAulEk.qrur9Dvnyt5_9",
                 "Zj7UnCAulEk.qrur9Dvnyt5_10"
-            ],
-            "ou": ["ImspTQPwCqd"]
+            ]
         }
     },
     "rowContext": {},
diff --git a/src/__demo__/data/event/integer.data.json b/src/__demo__/data/event/integer.data.json
index 1a45381e8..4ddedcb93 100644
--- a/src/__demo__/data/event/integer.data.json
+++ b/src/__demo__/data/event/integer.data.json
@@ -68,6 +68,13 @@
             "Zj7UnCAulEk": {
                 "name": "Inpatient morbidity and mortality"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "Zj7UnCAulEk.qrur9Dvnyt5_0": {
                 "name": "0"
             },
@@ -100,23 +107,11 @@
             },
             "Zj7UnCAulEk.qrur9Dvnyt5_10": {
                 "name": "10"
-            },
-            "": {
-                "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
-                }
             }
         },
         "dimensions": {
-            "pe": [
-                "202503",
-                "202504",
-                "202505"
-            ],
+            "pe": ["202503", "202504", "202505"],
+            "ou": ["ImspTQPwCqd"],
             "Zj7UnCAulEk.qrur9Dvnyt5": [
                 "Zj7UnCAulEk.qrur9Dvnyt5_0",
                 "Zj7UnCAulEk.qrur9Dvnyt5_1",
@@ -130,232 +125,49 @@
                 "Zj7UnCAulEk.qrur9Dvnyt5_9",
                 "Zj7UnCAulEk.qrur9Dvnyt5_10",
                 ""
-            ],
-            "ou": [
-                "ImspTQPwCqd"
             ]
         }
     },
     "rowContext": {},
     "width": 4,
     "rows": [
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_8",
-            "ImspTQPwCqd",
-            "202503",
-            "47"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_3",
-            "ImspTQPwCqd",
-            "202505",
-            "67"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_0",
-            "ImspTQPwCqd",
-            "202503",
-            "55"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_5",
-            "ImspTQPwCqd",
-            "202503",
-            "70"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_10",
-            "ImspTQPwCqd",
-            "202505",
-            "61"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_7",
-            "ImspTQPwCqd",
-            "202505",
-            "52"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_9",
-            "ImspTQPwCqd",
-            "202504",
-            "54"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_6",
-            "ImspTQPwCqd",
-            "202505",
-            "65"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_9",
-            "ImspTQPwCqd",
-            "202505",
-            "54"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_6",
-            "ImspTQPwCqd",
-            "202503",
-            "53"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_2",
-            "ImspTQPwCqd",
-            "202504",
-            "45"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_10",
-            "ImspTQPwCqd",
-            "202503",
-            "51"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_2",
-            "ImspTQPwCqd",
-            "202505",
-            "51"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_3",
-            "ImspTQPwCqd",
-            "202504",
-            "38"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_2",
-            "ImspTQPwCqd",
-            "202503",
-            "41"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_8",
-            "ImspTQPwCqd",
-            "202504",
-            "44"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_7",
-            "ImspTQPwCqd",
-            "202504",
-            "40"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_4",
-            "ImspTQPwCqd",
-            "202505",
-            "41"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_4",
-            "ImspTQPwCqd",
-            "202504",
-            "42"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_9",
-            "ImspTQPwCqd",
-            "202503",
-            "52"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_0",
-            "ImspTQPwCqd",
-            "202504",
-            "55"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_8",
-            "ImspTQPwCqd",
-            "202505",
-            "43"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_5",
-            "ImspTQPwCqd",
-            "202504",
-            "63"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_6",
-            "ImspTQPwCqd",
-            "202504",
-            "53"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_4",
-            "ImspTQPwCqd",
-            "202503",
-            "54"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_10",
-            "ImspTQPwCqd",
-            "202504",
-            "46"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_1",
-            "ImspTQPwCqd",
-            "202503",
-            "44"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_7",
-            "ImspTQPwCqd",
-            "202503",
-            "47"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_5",
-            "ImspTQPwCqd",
-            "202505",
-            "46"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_0",
-            "ImspTQPwCqd",
-            "202505",
-            "50"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_1",
-            "ImspTQPwCqd",
-            "202504",
-            "48"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_1",
-            "ImspTQPwCqd",
-            "202505",
-            "53"
-        ],
-        [
-            "Zj7UnCAulEk.qrur9Dvnyt5_3",
-            "ImspTQPwCqd",
-            "202503",
-            "56"
-        ],
-        [
-            "",
-            "ImspTQPwCqd",
-            "202505",
-            "5"
-        ],
-        [
-            "",
-            "ImspTQPwCqd",
-            "202504",
-            "12"
-        ],
-        [
-            "",
-            "ImspTQPwCqd",
-            "202503",
-            "10"
-        ]
+        ["Zj7UnCAulEk.qrur9Dvnyt5_8", "ImspTQPwCqd", "202503", "47"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_3", "ImspTQPwCqd", "202505", "67"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_0", "ImspTQPwCqd", "202503", "55"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_5", "ImspTQPwCqd", "202503", "70"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_10", "ImspTQPwCqd", "202505", "61"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_7", "ImspTQPwCqd", "202505", "52"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_9", "ImspTQPwCqd", "202504", "54"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_6", "ImspTQPwCqd", "202505", "65"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_9", "ImspTQPwCqd", "202505", "54"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_6", "ImspTQPwCqd", "202503", "53"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_2", "ImspTQPwCqd", "202504", "45"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_10", "ImspTQPwCqd", "202503", "51"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_2", "ImspTQPwCqd", "202505", "51"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_3", "ImspTQPwCqd", "202504", "38"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_2", "ImspTQPwCqd", "202503", "41"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_8", "ImspTQPwCqd", "202504", "44"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_7", "ImspTQPwCqd", "202504", "40"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_4", "ImspTQPwCqd", "202505", "41"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_4", "ImspTQPwCqd", "202504", "42"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_9", "ImspTQPwCqd", "202503", "52"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_0", "ImspTQPwCqd", "202504", "55"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_8", "ImspTQPwCqd", "202505", "43"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_5", "ImspTQPwCqd", "202504", "63"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_6", "ImspTQPwCqd", "202504", "53"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_4", "ImspTQPwCqd", "202503", "54"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_10", "ImspTQPwCqd", "202504", "46"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_1", "ImspTQPwCqd", "202503", "44"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_7", "ImspTQPwCqd", "202503", "47"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_5", "ImspTQPwCqd", "202505", "46"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_0", "ImspTQPwCqd", "202505", "50"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_1", "ImspTQPwCqd", "202504", "48"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_1", "ImspTQPwCqd", "202505", "53"],
+        ["Zj7UnCAulEk.qrur9Dvnyt5_3", "ImspTQPwCqd", "202503", "56"],
+        ["", "ImspTQPwCqd", "202505", "5"],
+        ["", "ImspTQPwCqd", "202504", "12"],
+        ["", "ImspTQPwCqd", "202503", "10"]
     ],
     "height": 267,
     "headerWidth": 4
-}
\ No newline at end of file
+}
diff --git a/src/__demo__/data/event/legendset.data.json b/src/__demo__/data/event/legendset.data.json
index 60c27d19e..70141f269 100644
--- a/src/__demo__/data/event/legendset.data.json
+++ b/src/__demo__/data/event/legendset.data.json
@@ -98,7 +98,7 @@
             },
             "": {
                 "name": "No value",
-                "style": {
+                "dimensionItemStyle": {
                     "fontStyle": "italic",
                     "color": "#6C7787",
                     "fontFamily": "monospace",
diff --git a/src/__demo__/data/event/optionset.data.hidena.json b/src/__demo__/data/event/optionset.data.hidena.json
index 88be1fad8..45aaa4439 100644
--- a/src/__demo__/data/event/optionset.data.hidena.json
+++ b/src/__demo__/data/event/optionset.data.hidena.json
@@ -93,6 +93,13 @@
             },
             "LAST_3_MONTHS": {
                 "name": "Last 3 months"
+            },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/optionset.data.json b/src/__demo__/data/event/optionset.data.json
index 992025f8b..4240b4eca 100644
--- a/src/__demo__/data/event/optionset.data.json
+++ b/src/__demo__/data/event/optionset.data.json
@@ -96,11 +96,9 @@
             },
             "": {
                 "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
                 }
             }
         },
diff --git a/src/__demo__/data/event/time.data.hidena.json b/src/__demo__/data/event/time.data.hidena.json
index fdf9a273d..993303abc 100644
--- a/src/__demo__/data/event/time.data.hidena.json
+++ b/src/__demo__/data/event/time.data.hidena.json
@@ -35,33 +35,6 @@
     ],
     "metaData": {
         "items": {
-            "jfuXZB3A1ko.BYmX7eQ71ku_04:50": {
-                "name": "04:50"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_08:10": {
-                "name": "08:10"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_08:11": {
-                "name": "08:11"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_13:30": {
-                "name": "13:30"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_13:55": {
-                "name": "13:55"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_14:01": {
-                "name": "14:01"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_14:02": {
-                "name": "14:02"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_17:35": {
-                "name": "17:35"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_23:00": {
-                "name": "23:00"
-            },
             "202411": {
                 "name": "November 2024"
             },
@@ -115,6 +88,40 @@
             },
             "pe": {
                 "name": "Period"
+            },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_04:50": {
+                "name": "04:50"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_08:10": {
+                "name": "08:10"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_08:11": {
+                "name": "08:11"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_13:30": {
+                "name": "13:30"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_13:55": {
+                "name": "13:55"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_14:01": {
+                "name": "14:01"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_14:02": {
+                "name": "14:02"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_17:35": {
+                "name": "17:35"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_23:00": {
+                "name": "23:00"
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/time.data.json b/src/__demo__/data/event/time.data.json
index 233b86f66..8fdfa11c9 100644
--- a/src/__demo__/data/event/time.data.json
+++ b/src/__demo__/data/event/time.data.json
@@ -35,33 +35,6 @@
     ],
     "metaData": {
         "items": {
-            "jfuXZB3A1ko.BYmX7eQ71ku_04:50": {
-                "name": "04:50"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_08:10": {
-                "name": "08:10"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_08:11": {
-                "name": "08:11"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_13:30": {
-                "name": "13:30"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_13:55": {
-                "name": "13:55"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_14:01": {
-                "name": "14:01"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_14:02": {
-                "name": "14:02"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_17:35": {
-                "name": "17:35"
-            },
-            "jfuXZB3A1ko.BYmX7eQ71ku_23:00": {
-                "name": "23:00"
-            },
             "202411": {
                 "name": "November 2024"
             },
@@ -118,12 +91,37 @@
             },
             "": {
                 "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
                 }
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_04:50": {
+                "name": "04:50"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_08:10": {
+                "name": "08:10"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_08:11": {
+                "name": "08:11"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_13:30": {
+                "name": "13:30"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_13:55": {
+                "name": "13:55"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_14:01": {
+                "name": "14:01"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_14:02": {
+                "name": "14:02"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_17:35": {
+                "name": "17:35"
+            },
+            "jfuXZB3A1ko.BYmX7eQ71ku_23:00": {
+                "name": "23:00"
             }
         },
         "dimensions": {
diff --git a/src/__demo__/data/event/yesonly.data.hidena.json b/src/__demo__/data/event/yesonly.data.hidena.json
index c386b7191..2a63bcfe2 100644
--- a/src/__demo__/data/event/yesonly.data.hidena.json
+++ b/src/__demo__/data/event/yesonly.data.hidena.json
@@ -86,6 +86,13 @@
             "pe": {
                 "name": "Period"
             },
+            "": {
+                "name": "No value",
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
+                }
+            },
             "jfuXZB3A1ko.hwG20Dyj6RK_1": {
                 "name": "Yes"
             }
diff --git a/src/__demo__/data/event/yesonly.data.json b/src/__demo__/data/event/yesonly.data.json
index d781716f1..e3933ecc5 100644
--- a/src/__demo__/data/event/yesonly.data.json
+++ b/src/__demo__/data/event/yesonly.data.json
@@ -86,17 +86,15 @@
             "pe": {
                 "name": "Period"
             },
-            "jfuXZB3A1ko.hwG20Dyj6RK_1": {
-                "name": "Yes"
-            },
             "": {
                 "name": "No value",
-                "style": {
-                    "fontStyle": "italic",
-                    "color": "#6C7787",
-                    "fontFamily": "monospace",
-                    "letterSpacing": "-0.3px"
+                "code": "D2__NOVALUE",
+                "dimensionItemStyle": {
+                    "color": "#6C7787"
                 }
+            },
+            "jfuXZB3A1ko.hwG20Dyj6RK_1": {
+                "name": "Yes"
             }
         },
         "dimensions": {
diff --git a/src/modules/pivotTable/getHeaderForDisplay.js b/src/modules/pivotTable/getHeaderForDisplay.js
index 1a67dcd13..6c1b0c973 100644
--- a/src/modules/pivotTable/getHeaderForDisplay.js
+++ b/src/modules/pivotTable/getHeaderForDisplay.js
@@ -42,6 +42,8 @@ export const getHeaderForDisplay = ({
         span,
         label,
         includesHierarchy,
-        ...(currentHeader?.style ? { style: currentHeader.style } : {}),
+        ...(currentHeader?.dimensionItemStyle
+            ? { style: currentHeader.dimensionItemStyle }
+            : {}),
     }
 }
diff --git a/src/modules/response/event/optionSet.js b/src/modules/response/event/optionSet.js
index 34d635d55..e51d08369 100644
--- a/src/modules/response/event/optionSet.js
+++ b/src/modules/response/event/optionSet.js
@@ -1,4 +1,4 @@
-import { NA_VALUE } from './response.js'
+import { D2__NOVALUE, NA_VALUE } from './response.js'
 
 export const getOptionCodeIdMap = (optionIds, items) =>
     optionIds.reduce((map, optionId) => {
@@ -25,9 +25,13 @@ export const getOptionIdRows = (rows, optionCodeIdMap, headerIndex) => {
 
 export const applyOptionSetHandler = (response, headerIndex) => {
     const header = response.headers[headerIndex]
-    const optionIds = response.metaData.dimensions[header.name]
+
+    response.metaData.dimensions[header.name] = response.metaData.dimensions[
+        header.name
+    ].map((id) => (id === D2__NOVALUE ? NA_VALUE : id))
+
     const optionCodeIdMap = getOptionCodeIdMap(
-        optionIds,
+        response.metaData.dimensions[header.name],
         response.metaData.items
     )
 
diff --git a/src/modules/response/event/response.js b/src/modules/response/event/response.js
index 6868e60c2..f27c3bcf8 100644
--- a/src/modules/response/event/response.js
+++ b/src/modules/response/event/response.js
@@ -27,13 +27,12 @@ import { applyOptionSetHandler } from './optionSet.js'
 
 export const PREFIX_SEPARATOR = '_'
 export const NA_VALUE = ''
+export const D2__NOVALUE = 'D2__NOVALUE'
 export const NA_VALUE_ITEM = {
     name: i18n.t('No value'),
-    style: {
-        fontStyle: 'italic',
+    code: D2__NOVALUE,
+    dimensionItemStyle: {
         color: '#6C7787',
-        fontFamily: 'monospace',
-        letterSpacing: '-0.3px',
     },
 }
 
@@ -124,6 +123,11 @@ const applyMetaDataItemNameOverrides = (items, metaDataItemNames) =>
         { ...items }
     )
 
+const addNoValueItem = (items) => ({
+    ...items,
+    [NA_VALUE]: NA_VALUE_ITEM,
+})
+
 export const transformResponse = (
     response,
     { hideNaData = false, metaDataItemNames = {} } = {}
@@ -134,9 +138,11 @@ export const transformResponse = (
         ...response,
         metaData: {
             ...response.metaData,
-            items: applyMetaDataItemNameOverrides(
-                response.metaData.items,
-                metaDataItemNames
+            items: addNoValueItem(
+                applyMetaDataItemNameOverrides(
+                    response.metaData.items,
+                    metaDataItemNames
+                )
             ),
             dimensions: {
                 ...response.metaData.dimensions,
@@ -181,19 +187,22 @@ export const transformResponse = (
         }
     })
 
-    // Add "No value" dimension item if "Hide NA data" option is disabled
-    // Only add if there is at least one empty value
+    // Add "No value" dimension item if
+    // - "Hide NA data" option is disabled
+    // - NA_VALUE is not already a dimension
+    // - there is at least one empty value
     if (!hideNaData) {
         metaHeaders.forEach((header) => {
             if (
-                response.rows.map((row) => row[header.index]).includes(NA_VALUE)
+                !transformedResponse.metaData.dimensions[header.name].includes(
+                    NA_VALUE
+                ) &&
+                response.rows.some((row) => row[header.index] === NA_VALUE)
             ) {
                 transformedResponse.metaData.dimensions[header.name] = [
                     ...transformedResponse.metaData.dimensions[header.name],
                     NA_VALUE,
                 ]
-
-                transformedResponse.metaData.items[NA_VALUE] = NA_VALUE_ITEM
             }
         })
     }