diff --git a/src/components/features/hackerapp/hacker-app-main.tsx b/src/components/features/hackerapp/hacker-app-main.tsx
index 00277ed..3618e08 100644
--- a/src/components/features/hackerapp/hacker-app-main.tsx
+++ b/src/components/features/hackerapp/hacker-app-main.tsx
@@ -181,7 +181,7 @@ export function HackerAppMain() {
     (section: HackerApplicationSections, index: number) =>
       setSectionQuestions(section, (data) => [
         ...data.slice(0, index + 1),
-        EMPTY_QUESTION,
+        { ...EMPTY_QUESTION, _id: crypto.randomUUID() },
         ...data.slice(index + 1),
       ]),
     [setSectionQuestions],
diff --git a/src/components/features/hackerapp/hacker-app-sections.ts b/src/components/features/hackerapp/hacker-app-sections.ts
index dfa5f9b..6663ef7 100644
--- a/src/components/features/hackerapp/hacker-app-sections.ts
+++ b/src/components/features/hackerapp/hacker-app-sections.ts
@@ -47,6 +47,8 @@ const SECTION_BY_FORM_INPUT: Partial<
   phoneNumber: "BasicInfo",
   phoneNumberOwnerNameAndRelationship: "BasicInfo",
   preferredName: "BasicInfo",
+  pronouns: "BasicInfo",
+  race: "BasicInfo",
   travellingToHackathon: "BasicInfo",
 
   contributionRole: "Skills",
@@ -74,6 +76,10 @@ export const isFormInputAllowedInSection = (
 export const QUESTION_TYPE_SECTION: Partial<
   Record<HackerApplicationQuestionType, HackerApplicationSections>
 > = {
+  "Full Legal Name": "BasicInfo",
+  School: "BasicInfo",
+  Major: "BasicInfo",
+  Country: "BasicInfo",
   Portfolio: "Skills",
   Github: "Skills",
   LinkedIn: "Skills",
diff --git a/src/services/hacker-application.ts b/src/services/hacker-application.ts
index 8441468..7e2b52c 100644
--- a/src/services/hacker-application.ts
+++ b/src/services/hacker-application.ts
@@ -58,8 +58,8 @@ export const subscribeToHackerAppQuestions = (
       query(collection(db, "HackerAppQuestions", hackathonName, section)),
       (snapshot) => {
         data[section] = snapshot.docs.map((doc) => ({
-          _id: doc.id,
           ...doc.data(),
+          _id: doc.id,
         }));
         loadedSections.add(section);
         if (loadedSections.size === HACKER_APP_SECTIONS.length) {