diff --git a/lib/components/steps/mapping/MappingStep.tsx b/lib/components/steps/mapping/MappingStep.tsx
index 32a69f0..86e1c87 100644
--- a/lib/components/steps/mapping/MappingStep.tsx
+++ b/lib/components/steps/mapping/MappingStep.tsx
@@ -53,7 +53,7 @@ interface CustomTabPanelProps extends BoxProps {
 }
 
 
-const CustomTabPanel: React.FC<CustomTabPanelProps> = ({ children, value, index, ...other }) => {
+const CustomTabPanel: React.FC<CustomTabPanelProps> = ({children, value, index, ...other}) => {
     return (
         <Box
             height={1}
@@ -93,7 +93,7 @@ function MappingStep() {
         setTabIndex((prevValue) => (prevValue + 1) % tabsArr.length);
     };
 
-    const renderTabComponent = () => {
+    const renderTabComponent = React.useMemo(() => {
         switch (tabIndex) {
             case TabsEnum.Collection:
                 return <CollectionsTab
@@ -104,11 +104,12 @@ function MappingStep() {
             case TabsEnum.Suggestions:
                 return <SuggestionsStep changeToNextTab={changeToNextTab}/>;
             case TabsEnum.Mapping:
-                return <MappingTab defaultCollection={defaultCollection} numberOfUnmappedRows={getUnmappedRowsCount()}/>;
+                return <MappingTab defaultCollection={defaultCollection}
+                                   numberOfUnmappedRows={getUnmappedRowsCount()}/>;
             default:
                 return <div>Unknown step</div>;
         }
-    };
+    }, [defaultCollection, getUnmappedRowsCount, tabIndex]);
 
     return (
         <Fragment>
@@ -139,14 +140,16 @@ function MappingStep() {
                                 </>
                             }
                         >
-                            <Tab disableRipple label={`${index + 1}. ${tab.label}`} {...a11yProps(index)} className={`${tab?.className}`} />
+                            <Tab disableRipple label={`${index + 1}. ${tab.label}`} {...a11yProps(index)}
+                                 className={`${tab?.className}`}/>
                         </Tooltip>
                     ))}
                 </Tabs>
 
                 <Box display='flex' gap='0.625rem' alignItems='center'>
                     {tabIndex === TabsEnum.Suggestions ? (
-                        <Button variant='text' onClick={() => setTabIndex(TabsEnum.Mapping)} className='suggestions__cancel-btn'>
+                        <Button variant='text' onClick={() => setTabIndex(TabsEnum.Mapping)}
+                                className='suggestions__cancel-btn'>
                             Continue without suggestions
                         </Button>) : tabIndex === TabsEnum.Mapping && (<>
                         <Typography className='mapping-header__indicator' sx={{
@@ -158,7 +161,7 @@ function MappingStep() {
                             {getUnmappedRowsCount()}/{getTotalRowsCount()} column headers still unmapped
                         </Typography>
 
-                            <Divider sx={{ height: '1.875rem', background: gray100, width: '0.0625rem' }} />
+                        <Divider sx={{height: '1.875rem', background: gray100, width: '0.0625rem'}}/>
 
                         <Button variant='contained' onClick={onClose}>
                             Save mapping
@@ -170,7 +173,7 @@ function MappingStep() {
                     key={index}
                     value={tabIndex}
                     index={index}>
-                    {renderTabComponent()}
+                    {renderTabComponent}
                 </CustomTabPanel>
             ))}
         </Fragment>
diff --git a/lib/components/steps/suggestions/SuggestionsStep.tsx b/lib/components/steps/suggestions/SuggestionsStep.tsx
index e8cf7e7..ada3b5e 100644
--- a/lib/components/steps/suggestions/SuggestionsStep.tsx
+++ b/lib/components/steps/suggestions/SuggestionsStep.tsx
@@ -46,7 +46,7 @@ function SuggestionsStep({changeToNextTab}: SuggestionsStepProps) {
     const [stepIndex, setStepIndex] = useState<number>(0);
 
     const [selectedSuggestion, setSelectedSuggestion] = useState<string[] | null>(null);
-    const [suggestionsToProcess, setSuggestionsToProcess] = useState<string[]>(getColumnsWithSuggestions());
+    const [suggestionsToProcess, setSuggestionsToProcess] = useState<string[]>([]);
 
     const handleNext = useCallback(() => {
         setCurrentKeyIndex((prevIndex) => (prevIndex + 1) % suggestionsToProcess.length);
diff --git a/lib/contexts/data/DataContextProvider.tsx b/lib/contexts/data/DataContextProvider.tsx
index 7ca66b9..ac9a489 100644
--- a/lib/contexts/data/DataContextProvider.tsx
+++ b/lib/contexts/data/DataContextProvider.tsx
@@ -88,21 +88,23 @@ export const DataContextProvider = ({
     const [datasetMapping, setDatasetMapping] = useState<DatasetMapping>(initialDatasetMapping);
     const [datasetMappingHeader, setDatasetMappingHeader] = useState<string[]>(initialDatasetMappingHeader);
 
-    const additionalDatasetMappings: DatasetMapping[] = rawAdditionalDatasetMappings.map((additionalMapping, index) => {
-        try {
-            validateDatasetMapping(additionalMapping, headerIndexes.variableName);
-        } catch (error) {
-            if (error instanceof Error) {
-                console.warn(`Skipping invalid additionalDatasetMapping at index ${index}: ${error.message}`);
-            } else {
-                console.warn(`Skipping invalid additionalDatasetMapping at index ${index}: Unknown error`);
+    const additionalDatasetMappings: DatasetMapping[] = useMemo(() => {
+        return rawAdditionalDatasetMappings.map((additionalMapping, index) => {
+            try {
+                validateDatasetMapping(additionalMapping, headerIndexes.variableName);
+            } catch (error) {
+                if (error instanceof Error) {
+                    console.warn(`Skipping invalid additionalDatasetMapping at index ${index}: ${error.message}`);
+                } else {
+                    console.warn(`Skipping invalid additionalDatasetMapping at index ${index}: Unknown error`);
+                }
+                return null;
             }
-            return null;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const [mappedAdditionalMapping, _] = getDatasetMapping(additionalMapping, headerIndexes);
-        return mappedAdditionalMapping;
-    }).filter(mapping => mapping !== null) as DatasetMapping[];
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            const [mappedAdditionalMapping, _] = getDatasetMapping(additionalMapping, headerIndexes);
+            return mappedAdditionalMapping;
+        }).filter(mapping => mapping !== null) as DatasetMapping[];
+    }, [rawAdditionalDatasetMappings, headerIndexes]);
 
     const suggestions = useMemo(() => {
         return computeSuggestions(initialDatasetMapping, additionalDatasetMappings, headerIndexes);