diff --git a/src/components/DataDimension/Info/DataElementInfo.js b/src/components/DataDimension/Info/DataElementInfo.js
index c3c72512c..4a1754bdd 100644
--- a/src/components/DataDimension/Info/DataElementInfo.js
+++ b/src/components/DataDimension/Info/DataElementInfo.js
@@ -3,7 +3,13 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import i18n from '../../../locales/index.js'
 import { valueTypeDisplayNames } from '../../../modules/valueTypes.js'
-import { getCommonFields, InfoTable } from './InfoTable.js'
+import {
+    getCommonFields,
+    renderDataSets,
+    renderLegendSets,
+    renderGroupMemberships,
+    InfoTable,
+} from './InfoTable.js'
 import styles from './styles/InfoPopover.style.js'
 
 const dataElementQuery = {
@@ -29,20 +35,12 @@ export const DataElementInfo = ({ id, displayNameProp }) => {
                 <tr>
                     <th>{i18n.t('Data set(s)')}</th>
                     <td>
-                        {data?.dataElement.dataSetElements.length === 1 ? (
-                            data.dataElement.dataSetElements[0].dataSet
-                                .displayName
-                        ) : (
-                            <ul>
-                                {data?.dataElement.dataSetElements.map(
-                                    ({ dataSet }) => (
-                                        <li key={dataSet.id}>
-                                            {dataSet.displayName}
-                                        </li>
-                                    )
-                                )}
-                            </ul>
-                        )}
+                        {data?.dataElement.dataSetElements &&
+                            renderDataSets(
+                                data.dataElement.dataSetElements.map(
+                                    ({ dataSet }) => dataSet
+                                )
+                            )}
                     </td>
                 </tr>
                 <tr>
@@ -66,18 +64,26 @@ export const DataElementInfo = ({ id, displayNameProp }) => {
                 <tr>
                     <th>{i18n.t('Category combo')}</th>
                     <td>
-                        <details>
-                            <summary>
-                                {data?.dataElement.categoryCombo.displayName}
-                            </summary>
-                            <ul>
-                                {data?.dataElement.categoryCombo.categories.map(
-                                    ({ id, displayName }) => (
-                                        <li key={id}>{displayName}</li>
-                                    )
-                                )}
-                            </ul>
-                        </details>
+                        {data?.dataElement.categoryCombo.displayName ===
+                        'default' ? (
+                            <span className="none">{i18n.t('None')}</span>
+                        ) : (
+                            <details>
+                                <summary>
+                                    {
+                                        data?.dataElement.categoryCombo
+                                            .displayName
+                                    }
+                                </summary>
+                                <ul>
+                                    {data?.dataElement.categoryCombo.categories.map(
+                                        ({ id, displayName }) => (
+                                            <li key={id}>{displayName}</li>
+                                        )
+                                    )}
+                                </ul>
+                            </details>
+                        )}
                     </td>
                 </tr>
                 {data?.dataElement.optionSet && (
@@ -89,35 +95,16 @@ export const DataElementInfo = ({ id, displayNameProp }) => {
                 <tr>
                     <th>{i18n.t('Group membership')}</th>
                     <td>
-                        {data?.dataElement.dataElementGroups.length === 1 ? (
-                            data.dataElement.dataElementGroups[0].displayName
-                        ) : (
-                            <ul>
-                                {data?.dataElement.dataElementGroups.map(
-                                    ({ id, displayName }) => (
-                                        <li key={id}>{displayName}</li>
-                                    )
-                                )}
-                            </ul>
-                        )}
+                        {data?.dataElement.dataElementGroups &&
+                            renderGroupMemberships(
+                                data.dataElement.dataElementGroups
+                            )}
                     </td>
                 </tr>
                 {Boolean(data?.dataElement.legendSets.length) && (
                     <tr>
                         <th>{i18n.t('Legend set(s)')}</th>
-                        <td>
-                            {data.dataElement.legendSets.length === 1 ? (
-                                data.dataElement.legendSets[0].displayName
-                            ) : (
-                                <ul>
-                                    {data.dataElement.legendSets.map(
-                                        ({ id, displayName }) => (
-                                            <li key={id}>{displayName}</li>
-                                        )
-                                    )}
-                                </ul>
-                            )}
-                        </td>
+                        <td>{renderLegendSets(data.dataElement.legendSets)}</td>
                     </tr>
                 )}
             </InfoTable>
diff --git a/src/components/DataDimension/Info/DataElementOperandInfo.js b/src/components/DataDimension/Info/DataElementOperandInfo.js
index fa8ed6da5..622a899ff 100644
--- a/src/components/DataDimension/Info/DataElementOperandInfo.js
+++ b/src/components/DataDimension/Info/DataElementOperandInfo.js
@@ -3,7 +3,13 @@ import PropTypes from 'prop-types'
 import React, { useCallback, useEffect, useState } from 'react'
 import i18n from '../../../locales/index.js'
 import { valueTypeDisplayNames } from '../../../modules/valueTypes.js'
-import { getCommonFields, InfoTable } from './InfoTable.js'
+import {
+    getCommonFields,
+    renderDataSets,
+    renderGroupMemberships,
+    renderLegendSets,
+    InfoTable,
+} from './InfoTable.js'
 import styles from './styles/InfoPopover.style.js'
 
 const dataElementOperandsQuery = {
@@ -81,21 +87,12 @@ export const DataElementOperandInfo = ({ id, displayNameProp }) => {
                 <tr>
                     <th>{i18n.t('Data set(s)')}</th>
                     <td>
-                        {data?.dataElementOperand.dataElement.dataSetElements
-                            .length === 1 ? (
-                            data.dataElementOperand.dataElement
-                                .dataSetElements[0].dataSet.displayName
-                        ) : (
-                            <ul>
-                                {data?.dataElementOperand.dataElement.dataSetElements.map(
-                                    ({ dataSet }) => (
-                                        <li key={dataSet.id}>
-                                            {dataSet.displayName}
-                                        </li>
-                                    )
-                                )}
-                            </ul>
-                        )}
+                        {data?.dataElementOperand.dataElement.dataSetElements &&
+                            renderDataSets(
+                                data.dataElementOperand.dataElement.dataSetElements.map(
+                                    ({ dataSet }) => dataSet
+                                )
+                            )}
                     </td>
                 </tr>
                 <tr>
@@ -125,21 +122,26 @@ export const DataElementOperandInfo = ({ id, displayNameProp }) => {
                 <tr>
                     <th>{i18n.t('Category combo')}</th>
                     <td>
-                        <details>
-                            <summary>
-                                {
-                                    data?.dataElementOperand.dataElement
-                                        .categoryCombo.displayName
-                                }
-                            </summary>
-                            <ul>
-                                {data?.dataElementOperand.dataElement.categoryCombo.categories.map(
-                                    ({ id, displayName }) => (
-                                        <li key={id}>{displayName}</li>
-                                    )
-                                )}
-                            </ul>
-                        </details>
+                        {data?.dataElementOperand.dataElement.categoryCombo
+                            .displayName === 'default' ? (
+                            <span className="none">{i18n.t('None')}</span>
+                        ) : (
+                            <details>
+                                <summary>
+                                    {
+                                        data?.dataElementOperand.dataElement
+                                            .categoryCombo.displayName
+                                    }
+                                </summary>
+                                <ul>
+                                    {data?.dataElementOperand.dataElement.categoryCombo.categories.map(
+                                        ({ id, displayName }) => (
+                                            <li key={id}>{displayName}</li>
+                                        )
+                                    )}
+                                </ul>
+                            </details>
+                        )}
                     </td>
                 </tr>
                 {data?.dataElementOperand.dataElement.optionSet && (
@@ -156,19 +158,12 @@ export const DataElementOperandInfo = ({ id, displayNameProp }) => {
                 <tr>
                     <th>{i18n.t('Group membership')}</th>
                     <td>
-                        {data?.dataElementOperand.dataElement.dataElementGroups
-                            .length === 1 ? (
-                            data.dataElementOperand.dataElement
-                                .dataElementGroups[0].displayName
-                        ) : (
-                            <ul>
-                                {data?.dataElementOperand.dataElement.dataElementGroups.map(
-                                    ({ id, displayName }) => (
-                                        <li key={id}>{displayName}</li>
-                                    )
-                                )}
-                            </ul>
-                        )}
+                        {data?.dataElementOperand.dataElement
+                            .dataElementGroups &&
+                            renderGroupMemberships(
+                                data.dataElementOperand.dataElement
+                                    .dataElementGroups
+                            )}
                     </td>
                 </tr>
                 {Boolean(
@@ -177,18 +172,8 @@ export const DataElementOperandInfo = ({ id, displayNameProp }) => {
                     <tr>
                         <th>{i18n.t('Legend set(s)')}</th>
                         <td>
-                            {data.dataElementOperand.dataElement.legendSets
-                                .length === 1 ? (
-                                data.dataElementOperand.dataElement
-                                    .legendSets[0].displayName
-                            ) : (
-                                <ul>
-                                    {data.dataElementOperand.dataElement.legendSets.map(
-                                        ({ id, displayName }) => (
-                                            <li key={id}>{displayName}</li>
-                                        )
-                                    )}
-                                </ul>
+                            {renderLegendSets(
+                                data.dataElementOperand.dataElement.legendSets
                             )}
                         </td>
                     </tr>
diff --git a/src/components/DataDimension/Info/EventDataItemInfo.js b/src/components/DataDimension/Info/EventDataItemInfo.js
index 8b5b867ed..5074580ab 100644
--- a/src/components/DataDimension/Info/EventDataItemInfo.js
+++ b/src/components/DataDimension/Info/EventDataItemInfo.js
@@ -4,7 +4,7 @@ import React from 'react'
 import i18n from '../../../locales/index.js'
 import { DIMENSION_TYPE_PROGRAM_DATA_ELEMENT } from '../../../modules/dataTypes.js'
 import { valueTypeDisplayNames } from '../../../modules/valueTypes.js'
-import { getCommonFields, InfoTable } from './InfoTable.js'
+import { getCommonFields, renderLegendSets, InfoTable } from './InfoTable.js'
 import styles from './styles/InfoPopover.style.js'
 
 const programDataElementQuery = {
@@ -66,19 +66,7 @@ export const EventDataItemInfo = ({ type, id, displayNameProp }) => {
                 {Boolean(data?.legendSets.length) && (
                     <tr>
                         <th>{i18n.t('Legend set(s)')}</th>
-                        <td>
-                            {data.legendSets.length === 1 ? (
-                                data.legendSets[0].displayName
-                            ) : (
-                                <ul>
-                                    {data.legendSets.map(
-                                        ({ id, displayName }) => (
-                                            <li key={id}>{displayName}</li>
-                                        )
-                                    )}
-                                </ul>
-                            )}
-                        </td>
+                        <td>{renderLegendSets(data.legendSets)}</td>
                     </tr>
                 )}
             </InfoTable>
diff --git a/src/components/DataDimension/Info/IndicatorInfo.js b/src/components/DataDimension/Info/IndicatorInfo.js
index 690e28dfa..9af68cd20 100644
--- a/src/components/DataDimension/Info/IndicatorInfo.js
+++ b/src/components/DataDimension/Info/IndicatorInfo.js
@@ -5,7 +5,9 @@ import { validateIndicatorExpressionMutation } from '../../../api/expression.js'
 import i18n from '../../../locales/index.js'
 import {
     getCommonFields,
+    renderGroupMemberships,
     renderHumanReadableExpression,
+    renderLegendSets,
     InfoTable,
 } from './InfoTable.js'
 import styles from './styles/InfoPopover.style.js'
@@ -156,39 +158,16 @@ export const IndicatorInfo = ({ id, displayNameProp }) => {
                 <tr>
                     <th>{i18n.t('Group membership')}</th>
                     <td>
-                        {data?.indicator.indicatorGroups.length === 1 ? (
-                            data.indicator.indicatorGroups[0].displayName
-                        ) : (
-                            <div className="content-wrap">
-                                <ul>
-                                    {data?.indicator.indicatorGroups.map(
-                                        ({ id, displayName }) => (
-                                            <li key={id}>{displayName}</li>
-                                        )
-                                    )}
-                                </ul>
-                            </div>
-                        )}
+                        {data?.indicator.indicatorGroups &&
+                            renderGroupMemberships(
+                                data.indicator.indicatorGroups
+                            )}
                     </td>
                 </tr>
                 {Boolean(data?.indicator.legendSets.length) && (
                     <tr>
                         <th>{i18n.t('Legend set(s)')}</th>
-                        <td>
-                            {data.indicator.legendSets.length === 1 ? (
-                                data.indicator.legendSets[0].displayName
-                            ) : (
-                                <div className="content-wrap">
-                                    <ul>
-                                        {data.indicator.legendSets.map(
-                                            ({ id, displayName }) => (
-                                                <li key={id}>{displayName}</li>
-                                            )
-                                        )}
-                                    </ul>
-                                </div>
-                            )}
-                        </td>
+                        <td>{renderLegendSets(data.indicator.legendSets)}</td>
                     </tr>
                 )}
             </InfoTable>
diff --git a/src/components/DataDimension/Info/InfoTable.js b/src/components/DataDimension/Info/InfoTable.js
index 9d7b457c1..ccb9875df 100644
--- a/src/components/DataDimension/Info/InfoTable.js
+++ b/src/components/DataDimension/Info/InfoTable.js
@@ -15,6 +15,58 @@ export const capitalizeText = (text) =>
 export const sentenceCaseText = (text) =>
     text && capitalizeText(text.replaceAll('_', ' ').toLowerCase())
 
+export const renderDataSets = (dataSets) => {
+    if (dataSets.length === 0) {
+        return (
+            <>
+                <span className="none">{i18n.t('None')}</span>
+                <style jsx>{styles}</style>
+            </>
+        )
+    } else if (dataSets.length === 1) {
+        return dataSets[0].displayName
+    } else {
+        return (
+            <>
+                <div className="content-wrap">
+                    <ul>
+                        {dataSets.map(({ id, displayName }) => (
+                            <li key={id}>{displayName}</li>
+                        ))}
+                    </ul>
+                </div>
+                <style jsx>{styles}</style>
+            </>
+        )
+    }
+}
+
+export const renderGroupMemberships = (groups) => {
+    if (groups.length === 0) {
+        return (
+            <>
+                <span className="none">{i18n.t('None')}</span>
+                <style jsx>{styles}</style>
+            </>
+        )
+    } else if (groups.length === 1) {
+        return groups[0].displayName
+    } else {
+        return (
+            <>
+                <div className="content-wrap">
+                    <ul>
+                        {groups.map(({ id, displayName }) => (
+                            <li key={id}>{displayName}</li>
+                        ))}
+                    </ul>
+                </div>
+                <style jsx>{styles}</style>
+            </>
+        )
+    }
+}
+
 export const renderHumanReadableExpression = (expressionData) => (
     <>
         {expressionData.status === 'ERROR' ? (
@@ -26,6 +78,23 @@ export const renderHumanReadableExpression = (expressionData) => (
     </>
 )
 
+export const renderLegendSets = (legendSets) => {
+    return legendSets.length === 1 ? (
+        legendSets[0].displayName
+    ) : (
+        <>
+            <div className="content-wrap">
+                <ul>
+                    {legendSets.map(({ id, displayName }) => (
+                        <li key={id}>{displayName}</li>
+                    ))}
+                </ul>
+            </div>
+            <style jsx>{styles}</style>
+        </>
+    )
+}
+
 export const InfoTable = ({ data, error, loading, children }) => {
     const { fromServerDate } = useTimeZoneConversion()
 
diff --git a/src/components/DataDimension/Info/ProgramIndicatorInfo.js b/src/components/DataDimension/Info/ProgramIndicatorInfo.js
index f07dee1a6..8d45c13ad 100644
--- a/src/components/DataDimension/Info/ProgramIndicatorInfo.js
+++ b/src/components/DataDimension/Info/ProgramIndicatorInfo.js
@@ -6,6 +6,7 @@ import i18n from '../../../locales/index.js'
 import {
     getCommonFields,
     renderHumanReadableExpression,
+    renderLegendSets,
     sentenceCaseText,
     InfoTable,
 } from './InfoTable.js'
@@ -198,19 +199,7 @@ export const ProgramIndicatorInfo = ({ id, displayNameProp }) => {
                     <tr>
                         <th>{i18n.t('Legend set(s)')}</th>
                         <td>
-                            {data.programIndicator.legendSets.length === 1 ? (
-                                data.programIndicator.legendSets[0].displayName
-                            ) : (
-                                <div className="content-wrap">
-                                    <ul>
-                                        {data.programIndicator.legendSets.map(
-                                            ({ id, displayName }) => (
-                                                <li key={id}>{displayName}</li>
-                                            )
-                                        )}
-                                    </ul>
-                                </div>
-                            )}
+                            {renderLegendSets(data.programIndicator.legendSets)}
                         </td>
                     </tr>
                 )}