diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index c5a140aa..acacf5d9 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -553,7 +553,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
   // Method to get fieldmapping
   const fetchFields = async (contentTypeId: string, searchText: string) => {
     try {
-      const { data } = await getFieldMapping(contentTypeId || '', 0, 30, searchText || '', projectId);
+      const { data } = await getFieldMapping(contentTypeId || '', 0, 1000, searchText || '', projectId);
 
       const itemStatusMap: ItemStatusMapProp = {};
 
diff --git a/ui/src/components/TestMigration/index.tsx b/ui/src/components/TestMigration/index.tsx
index c89c794c..a6388da7 100644
--- a/ui/src/components/TestMigration/index.tsx
+++ b/ui/src/components/TestMigration/index.tsx
@@ -49,8 +49,8 @@ const TestMigration = () => {
   const [isLoading, setIsLoading] = useState(newMigrationData?.isprojectMapped);
   const [isStackLoading, setIsStackLoading] = useState<boolean>(false);
   const [disableTestMigration, setdisableTestMigration] = useState<boolean>(newMigrationData?.test_migration?.isMigrationStarted);
-
-  const [disableCreateStack, setDisableCreateStack] = useState<boolean>( ! newMigrationData?.testStacks?.find((stack)=>stack?.stackUid === newMigrationData?.test_migration?.stack_api_key)?.isMigrated || newMigrationData?.test_migration?.isMigrationStarted  );
+ 
+  const [disableCreateStack, setDisableCreateStack] = useState<boolean>(newMigrationData?.test_migration?.stack_api_key && ! newMigrationData?.testStacks?.find((stack)=>stack?.stackUid === newMigrationData?.test_migration?.stack_api_key)?.isMigrated || newMigrationData?.test_migration?.isMigrationStarted  );
   const [stackLimitReached, setStackLimitReached] = useState<boolean>(false);
   
    // Extract project ID from URL parameters