diff --git a/ui/src/components/ContentMapper/index.scss b/ui/src/components/ContentMapper/index.scss
index 37eb6355b..0bd80e971 100644
--- a/ui/src/components/ContentMapper/index.scss
+++ b/ui/src/components/ContentMapper/index.scss
@@ -414,3 +414,16 @@ div .table-row {
     margin: 0 auto;
   }
 }
+
+.table-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;                   
+}
+.table-row .select {
+  flex: 1;                    
+}
+.advanced-setting-button,
+.table-row button {
+  flex-shrink: 0;           
+}
\ No newline at end of file
diff --git a/ui/src/components/LegacyCms/Actions/LoadFileFormat.tsx b/ui/src/components/LegacyCms/Actions/LoadFileFormat.tsx
index 990355d08..8083f1a70 100644
--- a/ui/src/components/LegacyCms/Actions/LoadFileFormat.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadFileFormat.tsx
@@ -58,9 +58,7 @@ const LoadFileFormat = (_props: LoadFileFormatProps) => {
           isactive: true,
           title: extractedFormat === 'zip' ? 'Zip' : extractedFormat.toUpperCase()
         };
-        
-        console.info('LoadFileFormat: DISPATCHING FILE FORMAT:', fileFormatObj);
-        
+                
         dispatch(updateNewMigrationData({
           ...newMigrationData,
           legacy_cms: {
@@ -69,31 +67,29 @@ const LoadFileFormat = (_props: LoadFileFormatProps) => {
           }
         }));
         
-        setFileIcon(fileFormatObj.title);
+        setFileIcon(fileFormatObj?.title);
       }
     } else if (!isEmptyString(currentFormat)) {
       setFileIcon(currentFormat);
     }
   }, [newMigrationData?.legacy_cms?.uploadedFile?.file_details?.localPath, newMigrationData?.legacy_cms?.selectedFileFormat, dispatch, newMigrationData]);
 
-  
   return (
     <div className="p-3">
       <div className="col-12">
         <label htmlFor="file-format">
           <TextInput
-            value={fileIcon === 'Folder' ? 'DIRECTORY' : fileIcon ? fileIcon :  'file extension not found'}
+            label="File Format"
+            value={fileIcon || 'File extension not found'}
             version="v2"
             isReadOnly={true}
-            disabled={true}
             width="large"
-            placeholder=""
             prefix={
               <Icon
-                icon={fileIcon ? fileIcon : 'CrashedPage'}
+                icon={fileIcon === 'DIRECTORY' ? 'Folder' : fileIcon ? fileIcon : 'CrashedPage'}
                 size="medium"
                 version="v2"
-                aria-label="fileformat"
+                aria-label="File format icon"
               />
             }
           />
diff --git a/upload-api/src/services/fileProcessing.ts b/upload-api/src/services/fileProcessing.ts
index e5ac5145d..f57e89079 100644
--- a/upload-api/src/services/fileProcessing.ts
+++ b/upload-api/src/services/fileProcessing.ts
@@ -41,7 +41,7 @@ const handleFileProcessing = async (
         file_details: config
       };
     }
-  } else if (fileExt === 'xml') {
+  } else if (fileExt === 'xml' && (cmsType === 'wordpress' || cmsType === 'drupal')) {
     if (await validator({ data: zipBuffer, type: cmsType, extension: fileExt })) {
       const $ = Cheerio.load(zipBuffer, { xmlMode: true });
       const fixedXml = $.xml();