diff --git a/src/components/Dialogs/Conditions/ConditionsManager.js b/src/components/Dialogs/Conditions/ConditionsManager.js
index 3caf4e907..2ae668548 100644
--- a/src/components/Dialogs/Conditions/ConditionsManager.js
+++ b/src/components/Dialogs/Conditions/ConditionsManager.js
@@ -477,7 +477,7 @@ const ConditionsManager = ({
                     </Tab>
                     {disableRepeatableTab ? (
                         <Tooltip
-                            key={`repeatable-tooltip`}
+                            key="repeatable-tooltip"
                             placement="bottom"
                             content={i18n.t(
                                 'Only available for repeatable stages'
diff --git a/src/components/Visualization/Visualization.js b/src/components/Visualization/Visualization.js
index be981386a..f0314950e 100644
--- a/src/components/Visualization/Visualization.js
+++ b/src/components/Visualization/Visualization.js
@@ -222,7 +222,7 @@ export const Visualization = ({
 
     if (headers && sortField) {
         // reset sorting if current sortField has been removed from Columns DHIS2-13948
-        if (!headers.includes(sortField)) {
+        if (!headers.flat().includes(sortField)) {
             setSorting({
                 sortField: null,
                 sortDirection: DEFAULT_SORT_DIRECTION,
@@ -576,6 +576,7 @@ export const Visualization = ({
                                         ) ? (
                                             <Tooltip
                                                 content={i18n.t('No event')}
+                                                key={`${rowIndex}_${columnIndex}-tooltip`}
                                             >
                                                 {(props) =>
                                                     renderCellContent({