diff --git a/ui/src/components/ContentMapper/index.scss b/ui/src/components/ContentMapper/index.scss
index f56ea9682..d8ac18003 100644
--- a/ui/src/components/ContentMapper/index.scss
+++ b/ui/src/components/ContentMapper/index.scss
@@ -151,7 +151,12 @@
   }
   .Table {
     border-left: 0 none;
-    // min-height: inherit;
+    min-height: 26.25rem;
+    // &__rowgroup {
+    //   display: flex;
+    //   flex: 1;
+    //   flex-direction: column;
+    // }
     .Table__body__row {
       //   height: auto!important;
       //   min-height: 80px;
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 7fd2d8d4a..320ce4715 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -760,6 +760,10 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       }
 
       setItemStatusMap(itemStatusMap);
+      setLoading(true);
+
+
+      // console.info('loading', loading);
 
       const { data } = await getFieldMapping(contentTypeId || '', 0, 1000, searchText || '', projectId);
 
@@ -769,6 +773,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       }
 
       setItemStatusMap({ ...itemStatusMap });
+      setLoading(false);
 
       const validTableData = data?.fieldMapping?.filter((field: FieldMapType) => field?.otherCmsType !== undefined);
 
@@ -777,7 +782,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       setSelectedEntries(validTableData ?? []);
       setTotalCounts(validTableData?.length);
       setInitialRowSelectedData(validTableData?.filter((item: FieldMapType) => !item?.isDeleted))
-      setIsLoading(false);
+      // setIsLoading(false);
       generateSourceGroupSchema(validTableData);
     } catch (error) {
       console.error('fetchData -> error', error);
@@ -800,7 +805,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       }
 
       setItemStatusMap({ ...itemStatusMapCopy });
-      setLoading(true);
+      // setLoading(true);
 
       const { data } = await getFieldMapping(contentTypeUid || '', skip, limit, searchText || '', projectId);
 
@@ -2645,20 +2650,20 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
                   initialRowSelectedData={initialRowSelectedData}
                   initialSelectedRowIds={rowIds}
                   itemSize={80}
-                  v2Features={{
-                    isNewEmptyState: true
-                  }}
-                  customEmptyState={
-                    <EmptyState
-                      forPage="list"
-                      heading={<div className="empty_search_heading">No Fields available</div>}
-                      moduleIcon="NoSearchResult"
-                      description="Try changing the search query to find what you are looking for."
-                      version="v2"
-                      testId="no-results-found-page"
-                      className="custom-empty-state"
-                    />
-                  }
+                  // v2Features={{
+                  //   isNewEmptyState: true
+                  // }}
+                  // customEmptyState={
+                  //   <EmptyState
+                  //     forPage="list"
+                  //     heading={<div className="empty_search_heading">No Fields available</div>}
+                  //     moduleIcon="NoSearchResult"
+                  //     description="Try changing the search query to find what you are looking for."
+                  //     version="v2"
+                  //     testId="no-results-found-page"
+                  //     className="custom-empty-state"
+                  //   />
+                  // }
                   withExportCta={{
                     component: (
                       <div className='d-flex align-items-center'>