diff --git a/public/locale/en.json b/public/locale/en.json
index 3f6aac87f3c..40bf5df4216 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -493,6 +493,7 @@
   "bed_type__500": "Others",
   "before": "before",
   "beta": "beta",
+  "biologic": "Biologic",
   "bladder": "Bladder",
   "blood_group": "Blood Group",
   "blood_group_is_required": "Blood group is required",
@@ -989,6 +990,7 @@
   "enter_year_of_birth_to_verify": "Enter year of birth to verify",
   "entered_in_error": "Entered in Error",
   "entered_in_error_warning": "This action cannot be undone. The appointment will be marked as entered in error and removed from the system.",
+  "environment": "Environment",
   "error_404": "Error 404",
   "error_deleting_shifting": "Error while deleting Shifting record",
   "error_fetching_facility_data": "Error while fetching facility data",
@@ -1078,6 +1080,7 @@
   "filter_by_date": "Filter by Date",
   "filters": "Filters",
   "first_name": "First Name",
+  "food": "Food",
   "footer_body": "Open Healthcare Network is an open-source public utility designed by a multi-disciplinary team of innovators and volunteers. Open Healthcare Network CARE is a Digital Public Good recognised by the United Nations.",
   "forget_password": "Forgot password?",
   "forget_password_instruction": "Enter your username, and if it exists, we will send you a link to reset your password.",
@@ -2109,6 +2112,7 @@
   "type_to_search": "Type to search",
   "type_your_comment": "Type your comment",
   "type_your_reason_here": "Type your reason here",
+  "unable_to_assess": "Unable to Assess",
   "unable_to_get_current_position": "Unable to get current position.",
   "unable_to_get_location: ": "Unable to get location: ",
   "unassign": "Unassign",
@@ -2260,6 +2264,7 @@
   "video_conference_link": "Video Conference Link",
   "view": "View",
   "view_abdm_records": "View ABDM Records",
+  "view_all": "view all",
   "view_all_details": "View All Details",
   "view_and_manage_patient_encounters": "View and manage patient encounters",
   "view_asset": "View Assets",
diff --git a/src/components/Common/ComboboxQuantityInput.tsx b/src/components/Common/ComboboxQuantityInput.tsx
index db7b8caa4d2..19674422d81 100644
--- a/src/components/Common/ComboboxQuantityInput.tsx
+++ b/src/components/Common/ComboboxQuantityInput.tsx
@@ -50,6 +50,7 @@ export function ComboboxQuantityInput({
   const showDropdown = /^\d+$/.test(inputValue);
 
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (disabled) return;
     const value = e.target.value;
     if (value === "" || /^\d+$/.test(value)) {
       setInputValue(value);
@@ -65,7 +66,7 @@ export function ComboboxQuantityInput({
   };
 
   const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (!showDropdown) return;
+    if (disabled || !showDropdown) return;
 
     if (e.key === "ArrowDown") {
       e.preventDefault();
@@ -102,7 +103,7 @@ export function ComboboxQuantityInput({
 
   return (
     <div className="relative flex w-full lg:max-w-[200px] flex-col gap-1">
-      <Popover open={open && showDropdown} onOpenChange={setOpen}>
+      <Popover open={!disabled && open && showDropdown} onOpenChange={setOpen}>
         <PopoverTrigger asChild>
           <div className="relative">
             <Input
diff --git a/src/components/Patient/MedicationStatementList.tsx b/src/components/Patient/MedicationStatementList.tsx
index 19610079e8d..6541dd062cd 100644
--- a/src/components/Patient/MedicationStatementList.tsx
+++ b/src/components/Patient/MedicationStatementList.tsx
@@ -1,9 +1,9 @@
 import { useQuery } from "@tanstack/react-query";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { cn } from "@/lib/utils";
-
 import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
@@ -28,10 +28,84 @@ interface MedicationStatementListProps {
   patientId: string;
 }
 
+interface MedicationRowProps {
+  statement: any;
+  isEnteredInError?: boolean;
+  index: number;
+}
+
+function MedicationRow({
+  statement,
+  isEnteredInError,
+  index,
+}: MedicationRowProps) {
+  return (
+    <TableRow
+      key={index}
+      className={isEnteredInError ? "opacity-50 bg-gray-50/50" : undefined}
+    >
+      <TableCell className="font-medium">
+        <Tooltip>
+          <TooltipTrigger asChild className="max-w-60 truncate">
+            <p>{statement.medication.display ?? statement.medication.code}</p>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{statement.medication.display ?? statement.medication.code}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TableCell>
+      <TableCell>
+        <Tooltip>
+          <TooltipTrigger asChild className="max-w-36 truncate">
+            <p>{statement.dosage_text}</p>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{statement.dosage_text}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TableCell>
+      <TableCell>
+        <Badge
+          variant={isEnteredInError ? "destructive" : "outline"}
+          className="whitespace-nowrap capitalize"
+        >
+          {statement.status}
+        </Badge>
+      </TableCell>
+      <TableCell className="whitespace-nowrap">
+        {[statement.effective_period?.start, statement.effective_period?.end]
+          .map((date) => formatDateTime(date))
+          .join(" - ")}
+      </TableCell>
+      <TableCell>
+        <Tooltip>
+          <TooltipTrigger asChild className="max-w-60 truncate">
+            <p>{statement.reason}</p>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{statement.reason}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TableCell>
+      <TableCell>
+        <Tooltip>
+          <TooltipTrigger asChild className="max-w-60 truncate">
+            <p>{statement.note}</p>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{statement.note}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TableCell>
+    </TableRow>
+  );
+}
+
 export function MedicationStatementList({
   patientId,
 }: MedicationStatementListProps) {
   const { t } = useTranslation();
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: medications, isLoading } = useQuery({
     queryKey: ["medication_statement", patientId],
@@ -53,7 +127,16 @@ export function MedicationStatementList({
     );
   }
 
-  if (!medications?.results?.length) {
+  const filteredMedications = medications?.results?.filter(
+    (medication) =>
+      showEnteredInError || medication.status !== "entered_in_error",
+  );
+
+  const hasEnteredInErrorRecords = medications?.results?.some(
+    (medication) => medication.status === "entered_in_error",
+  );
+
+  if (!filteredMedications?.length) {
     return (
       <Card>
         <CardHeader>
@@ -66,22 +149,11 @@ export function MedicationStatementList({
     );
   }
 
-  const getStatusBadgeStyle = (status: string | undefined) => {
-    switch (status?.toLowerCase()) {
-      case "active":
-        return "bg-green-100 text-green-800 border-green-200";
-      case "on_hold":
-        return "bg-gray-100 text-gray-800 border-blue-200";
-      default:
-        return "bg-gray-100 text-gray-800 border-gray-200";
-    }
-  };
-
   return (
     <Card className="p-0">
       <CardHeader className="px-4 py-0 pt-4">
         <CardTitle>
-          {t("ongoing_medications")} ({medications.count})
+          {t("ongoing_medications")} ({filteredMedications.length})
         </CardTitle>
       </CardHeader>
       <CardContent className="p-2">
@@ -97,77 +169,34 @@ export function MedicationStatementList({
             </TableRow>
           </TableHeader>
           <TableBody>
-            {medications.results.map((statement, index) => (
-              <TableRow key={index}>
-                <TableCell className="font-medium">
-                  <Tooltip>
-                    <TooltipTrigger asChild className="max-w-60 truncate">
-                      <p>
-                        {statement.medication.display ??
-                          statement.medication.code}
-                      </p>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>
-                        {statement.medication.display ??
-                          statement.medication.code}
-                      </p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TableCell>
-                <TableCell>
-                  <Tooltip>
-                    <TooltipTrigger asChild className="max-w-36 truncate">
-                      <p>{statement.dosage_text}</p>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>{statement.dosage_text}</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TableCell>
-                <TableCell>
-                  <Badge
-                    variant="outline"
-                    className={cn(
-                      "whitespace-nowrap capitalize",
-                      getStatusBadgeStyle(statement.status),
-                    )}
-                  >
-                    {statement.status}
-                  </Badge>
-                </TableCell>
-                <TableCell className="whitespace-nowrap">
-                  {[
-                    statement.effective_period?.start,
-                    statement.effective_period?.end,
-                  ]
-                    .map((date) => formatDateTime(date))
-                    .join(" - ")}
-                </TableCell>
-                <TableCell>
-                  <Tooltip>
-                    <TooltipTrigger asChild className="max-w-60 truncate">
-                      <p>{statement.reason ?? "-"}</p>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>{statement.reason ?? "Not Specified"}</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TableCell>
-                <TableCell>
-                  <Tooltip>
-                    <TooltipTrigger asChild className="max-w-60 truncate">
-                      <p>{statement.note ?? "-"}</p>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>{statement.note ?? "Not Specified"}</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TableCell>
-              </TableRow>
-            ))}
+            {filteredMedications.map((statement, index) => {
+              const isEnteredInError = statement.status === "entered_in_error";
+
+              return (
+                <>
+                  <MedicationRow
+                    key={statement.id}
+                    statement={statement}
+                    isEnteredInError={isEnteredInError}
+                    index={index}
+                  />
+                </>
+              );
+            })}
           </TableBody>
         </Table>
+        {hasEnteredInErrorRecords && !showEnteredInError && (
+          <div className="flex justify-start">
+            <Button
+              variant="ghost"
+              size="xs"
+              onClick={() => setShowEnteredInError(true)}
+              className="text-xs underline text-gray-500"
+            >
+              {t("view_all")}
+            </Button>
+          </div>
+        )}
       </CardContent>
     </Card>
   );
diff --git a/src/components/Patient/allergy/list.tsx b/src/components/Patient/allergy/list.tsx
index 4034143c83d..8e1a9686a90 100644
--- a/src/components/Patient/allergy/list.tsx
+++ b/src/components/Patient/allergy/list.tsx
@@ -2,9 +2,10 @@ import { useQuery } from "@tanstack/react-query";
 import { t } from "i18next";
 import { PencilIcon } from "lucide-react";
 import { Link } from "raviger";
-import { ReactNode } from "react";
+import { ReactNode, useState } from "react";
 
 import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
@@ -19,7 +20,6 @@ import {
 import { Avatar } from "@/components/Common/Avatar";
 
 import query from "@/Utils/request/query";
-import { formatName } from "@/Utils/utils";
 import { AllergyIntolerance } from "@/types/emr/allergyIntolerance/allergyIntolerance";
 import allergyIntoleranceApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi";
 
@@ -34,6 +34,8 @@ export function AllergyList({
   patientId,
   encounterId,
 }: AllergyListProps) {
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
+
   const { data: allergies, isLoading } = useQuery({
     queryKey: ["allergies", patientId, encounterId],
     queryFn: query(allergyIntoleranceApi.getAllergy, {
@@ -49,21 +51,30 @@ export function AllergyList({
         patientId={patientId}
         encounterId={encounterId}
       >
-        <CardContent>
+        <CardContent className="px-2 pb-2">
           <Skeleton className="h-[100px] w-full" />
         </CardContent>
       </AllergyListLayout>
     );
   }
 
-  if (!allergies?.results?.length) {
+  const filteredAllergies = allergies?.results?.filter(
+    (allergy) =>
+      showEnteredInError || allergy.verification_status !== "entered_in_error",
+  );
+
+  const hasEnteredInErrorRecords = allergies?.results?.some(
+    (allergy) => allergy.verification_status === "entered_in_error",
+  );
+
+  if (!filteredAllergies?.length) {
     return (
       <AllergyListLayout
         facilityId={facilityId}
         patientId={patientId}
         encounterId={encounterId}
       >
-        <CardContent>
+        <CardContent className="px-2 pb-2">
           <p className="text-muted-foreground">{t("no_allergies_recorded")}</p>
         </CardContent>
       </AllergyListLayout>
@@ -94,6 +105,62 @@ export function AllergyList({
     }
   };
 
+  interface AllergyRowProps {
+    allergy: AllergyIntolerance;
+    isEnteredInError?: boolean;
+  }
+
+  function AllergyRow({ allergy, isEnteredInError }: AllergyRowProps) {
+    return (
+      <TableRow
+        className={isEnteredInError ? "opacity-50 bg-gray-50/50" : undefined}
+      >
+        <TableCell className="font-medium">{allergy.code.display}</TableCell>
+        <TableCell>
+          <Badge
+            variant="outline"
+            className={`whitespace-nowrap ${getCategoryBadgeStyle(
+              allergy.category ?? "",
+            )}`}
+          >
+            {t(allergy.category)}
+          </Badge>
+        </TableCell>
+        <TableCell>
+          <Badge
+            variant="outline"
+            className={`whitespace-nowrap ${getStatusBadgeStyle(
+              allergy.clinical_status,
+            )}`}
+          >
+            {t(allergy.clinical_status)}
+          </Badge>
+        </TableCell>
+        <TableCell>
+          <Badge variant="secondary" className="whitespace-nowrap">
+            {t(allergy.criticality)}
+          </Badge>
+        </TableCell>
+        <TableCell>
+          <Badge
+            variant={isEnteredInError ? "destructive" : "outline"}
+            className="whitespace-nowrap capitalize"
+          >
+            {t(allergy.verification_status)}
+          </Badge>
+        </TableCell>
+        <TableCell className="whitespace-nowrap flex items-center gap-2">
+          <Avatar
+            name={allergy.created_by.username}
+            className="w-4 h-4"
+            imageUrl={allergy.created_by.profile_picture_url}
+          />
+          <span className="text-sm">{allergy.created_by.username}</span>
+        </TableCell>
+      </TableRow>
+    );
+  }
+
   return (
     <AllergyListLayout
       facilityId={facilityId}
@@ -107,61 +174,47 @@ export function AllergyList({
             <TableHead>{t("category")}</TableHead>
             <TableHead>{t("status")}</TableHead>
             <TableHead>{t("criticality")}</TableHead>
+            <TableHead>{t("verification")}</TableHead>
             <TableHead>{t("created_by")}</TableHead>
           </TableRow>
         </TableHeader>
         <TableBody>
-          {allergies.results
-            .sort((a, _b) => {
-              if (a.clinical_status === "inactive") {
-                return 1;
-              }
-              return -1;
-            })
-            .map((allergy: AllergyIntolerance) => (
-              <TableRow key={allergy.id}>
-                <TableCell className="font-medium">
-                  {allergy.code.display}
-                </TableCell>
-                <TableCell>
-                  <Badge
-                    variant="outline"
-                    className={`whitespace-nowrap ${getCategoryBadgeStyle(
-                      allergy.category ?? "",
-                    )}`}
-                  >
-                    {allergy.category}
-                  </Badge>
-                </TableCell>
-                <TableCell>
-                  <Badge
-                    variant="outline"
-                    className={`whitespace-nowrap ${getStatusBadgeStyle(
-                      allergy.clinical_status,
-                    )}`}
-                  >
-                    {allergy.clinical_status}
-                  </Badge>
-                </TableCell>
-                <TableCell>
-                  <Badge variant="secondary" className="whitespace-nowrap">
-                    {allergy.criticality}
-                  </Badge>
-                </TableCell>
-                <TableCell className="whitespace-nowrap flex items-center gap-2">
-                  <Avatar
-                    name={allergy.created_by.username}
-                    className="w-4 h-4"
-                    imageUrl={allergy.created_by.profile_picture_url}
-                  />
-                  <span className="text-sm">
-                    {formatName(allergy.created_by)}
-                  </span>
-                </TableCell>
-              </TableRow>
+          {/* Valid entries */}
+          {filteredAllergies
+            .filter(
+              (allergy) => allergy.verification_status !== "entered_in_error",
+            )
+            .map((allergy) => (
+              <AllergyRow key={allergy.id} allergy={allergy} />
             ))}
+
+          {/* Entered in error entries */}
+          {showEnteredInError &&
+            filteredAllergies
+              .filter(
+                (allergy) => allergy.verification_status === "entered_in_error",
+              )
+              .map((allergy) => (
+                <AllergyRow
+                  key={allergy.id}
+                  allergy={allergy}
+                  isEnteredInError
+                />
+              ))}
         </TableBody>
       </Table>
+      {hasEnteredInErrorRecords && !showEnteredInError && (
+        <div className="flex justify-start">
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={() => setShowEnteredInError(true)}
+            className="text-xs underline text-gray-500"
+          >
+            {t("view_all")}
+          </Button>
+        </div>
+      )}
     </AllergyListLayout>
   );
 }
@@ -191,7 +244,7 @@ const AllergyListLayout = ({
           </Link>
         )}
       </CardHeader>
-      {children}
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };
diff --git a/src/components/Patient/diagnosis/DiagnosisTable.tsx b/src/components/Patient/diagnosis/DiagnosisTable.tsx
index 4646c028a9e..d9134f6d0c8 100644
--- a/src/components/Patient/diagnosis/DiagnosisTable.tsx
+++ b/src/components/Patient/diagnosis/DiagnosisTable.tsx
@@ -54,46 +54,61 @@ export function DiagnosisTable({
         </TableHeader>
       )}
       <TableBody>
-        {diagnoses.map((diagnosis: Diagnosis, index) => (
-          <TableRow key={index}>
-            <TableCell className="font-medium">
-              {diagnosis.code.display}
-            </TableCell>
-            <TableCell>
-              <Badge
-                variant="outline"
-                className={`whitespace-nowrap ${getStatusBadgeStyle(diagnosis.clinical_status)}`}
+        {diagnoses.map((diagnosis: Diagnosis, index) => {
+          const isEnteredInError =
+            diagnosis.verification_status === "entered_in_error";
+
+          return (
+            <>
+              <TableRow
+                key={index}
+                className={
+                  isEnteredInError ? "opacity-50 bg-gray-50/50" : undefined
+                }
               >
-                {diagnosis.clinical_status}
-              </Badge>
-            </TableCell>
-            <TableCell>
-              <Badge variant="secondary" className="whitespace-nowrap">
-                {diagnosis.verification_status}
-              </Badge>
-            </TableCell>
-            <TableCell className="whitespace-nowrap">
-              {diagnosis.onset?.onset_datetime
-                ? new Date(diagnosis.onset.onset_datetime).toLocaleDateString()
-                : "-"}
-            </TableCell>
-            <TableCell className="max-w-[200px] truncate">
-              {diagnosis.note || "-"}
-            </TableCell>
-            <TableCell className="whitespace-nowrap ">
-              <div className="flex items-center gap-2">
-                <Avatar
-                  name={formatName(diagnosis.created_by)}
-                  className="w-4 h-4"
-                  imageUrl={diagnosis.created_by?.profile_picture_url}
-                />
-                <span className="text-sm">
-                  {formatName(diagnosis.created_by)}
-                </span>
-              </div>
-            </TableCell>
-          </TableRow>
-        ))}
+                <TableCell className="font-medium">
+                  {diagnosis.code.display}
+                </TableCell>
+                <TableCell>
+                  <Badge
+                    variant="outline"
+                    className={`whitespace-nowrap ${getStatusBadgeStyle(diagnosis.clinical_status)}`}
+                  >
+                    {t(diagnosis.clinical_status)}
+                  </Badge>
+                </TableCell>
+                <TableCell>
+                  <Badge
+                    variant={isEnteredInError ? "destructive" : "outline"}
+                    className="whitespace-nowrap capitalize"
+                  >
+                    {t(diagnosis.verification_status)}
+                  </Badge>
+                </TableCell>
+                <TableCell className="whitespace-nowrap">
+                  {diagnosis.onset?.onset_datetime
+                    ? new Date(
+                        diagnosis.onset.onset_datetime,
+                      ).toLocaleDateString()
+                    : "-"}
+                </TableCell>
+                <TableCell className="max-w-[200px] truncate">
+                  {diagnosis.note || "-"}
+                </TableCell>
+                <TableCell className="whitespace-nowrap flex items-center gap-2">
+                  <Avatar
+                    name={formatName(diagnosis.created_by)}
+                    className="w-4 h-4"
+                    imageUrl={diagnosis.created_by?.profile_picture_url}
+                  />
+                  <span className="text-sm">
+                    {formatName(diagnosis.created_by)}
+                  </span>
+                </TableCell>
+              </TableRow>
+            </>
+          );
+        })}
       </TableBody>
     </Table>
   );
diff --git a/src/components/Patient/diagnosis/list.tsx b/src/components/Patient/diagnosis/list.tsx
index cf1e375fd58..d0e8c4acede 100644
--- a/src/components/Patient/diagnosis/list.tsx
+++ b/src/components/Patient/diagnosis/list.tsx
@@ -2,8 +2,9 @@ import { useQuery } from "@tanstack/react-query";
 import { t } from "i18next";
 import { PencilIcon } from "lucide-react";
 import { Link } from "raviger";
-import { ReactNode } from "react";
+import { ReactNode, useState } from "react";
 
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 
@@ -23,6 +24,8 @@ export function DiagnosisList({
   encounterId,
   facilityId,
 }: DiagnosisListProps) {
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
+
   const { data: diagnoses, isLoading } = useQuery({
     queryKey: ["diagnosis", patientId, encounterId],
     queryFn: query(diagnosisApi.listDiagnosis, {
@@ -43,14 +46,24 @@ export function DiagnosisList({
     );
   }
 
-  if (!diagnoses?.results?.length) {
+  const filteredDiagnoses = diagnoses?.results?.filter(
+    (diagnosis) =>
+      showEnteredInError ||
+      diagnosis.verification_status !== "entered_in_error",
+  );
+
+  const hasEnteredInErrorRecords = diagnoses?.results?.some(
+    (diagnosis) => diagnosis.verification_status === "entered_in_error",
+  );
+
+  if (!filteredDiagnoses?.length) {
     return (
       <DiagnosisListLayout
         facilityId={facilityId}
         patientId={patientId}
         encounterId={encounterId}
       >
-        <p className="text-muted-foreground">No diagnoses recorded</p>
+        <p className="text-muted-foreground">{t("no_diagnoses_recorded")}</p>
       </DiagnosisListLayout>
     );
   }
@@ -61,7 +74,32 @@ export function DiagnosisList({
       patientId={patientId}
       encounterId={encounterId}
     >
-      <DiagnosisTable diagnoses={diagnoses.results} />
+      <DiagnosisTable
+        diagnoses={[
+          ...filteredDiagnoses.filter(
+            (diagnosis) => diagnosis.verification_status !== "entered_in_error",
+          ),
+          ...(showEnteredInError
+            ? filteredDiagnoses.filter(
+                (diagnosis) =>
+                  diagnosis.verification_status === "entered_in_error",
+              )
+            : []),
+        ]}
+      />
+
+      {hasEnteredInErrorRecords && !showEnteredInError && (
+        <div className="flex justify-start">
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={() => setShowEnteredInError(true)}
+            className="text-xs underline text-gray-500"
+          >
+            {t("view_all")}
+          </Button>
+        </div>
+      )}
     </DiagnosisListLayout>
   );
 }
@@ -91,7 +129,7 @@ const DiagnosisListLayout = ({
           </Link>
         )}
       </CardHeader>
-      <CardContent>{children}</CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };
diff --git a/src/components/Patient/symptoms/SymptomTable.tsx b/src/components/Patient/symptoms/SymptomTable.tsx
index c9c10266368..b95e518d99d 100644
--- a/src/components/Patient/symptoms/SymptomTable.tsx
+++ b/src/components/Patient/symptoms/SymptomTable.tsx
@@ -48,52 +48,73 @@ export function SymptomTable({
             <TableHead>{t("status")}</TableHead>
             <TableHead>{t("severity")}</TableHead>
             <TableHead>{t("onset")}</TableHead>
+            <TableHead>{t("verification")}</TableHead>
             <TableHead>{t("notes")}</TableHead>
             <TableHead>{t("created_by")}</TableHead>
           </TableRow>
         </TableHeader>
       )}
       <TableBody>
-        {symptoms.map((symptom: Symptom, index: number) => (
-          <TableRow key={index}>
-            <TableCell className="font-medium">
-              {symptom.code.display}
-            </TableCell>
-            <TableCell>
-              <Badge
-                variant="outline"
-                className={`whitespace-nowrap ${getStatusBadgeStyle(symptom.clinical_status)}`}
+        {symptoms.map((symptom: Symptom, index: number) => {
+          const isEnteredInError =
+            symptom.verification_status === "entered_in_error";
+
+          return (
+            <>
+              <TableRow
+                key={index}
+                className={
+                  isEnteredInError ? "opacity-50 bg-gray-50/50" : undefined
+                }
               >
-                {symptom.clinical_status}
-              </Badge>
-            </TableCell>
-            <TableCell>
-              <Badge variant="secondary" className="whitespace-nowrap">
-                {symptom.severity}
-              </Badge>
-            </TableCell>
-            <TableCell className="whitespace-nowrap">
-              {symptom.onset?.onset_datetime
-                ? new Date(symptom.onset.onset_datetime).toLocaleDateString()
-                : "-"}
-            </TableCell>
-            <TableCell className="max-w-[200px] truncate">
-              {symptom.note || "-"}
-            </TableCell>
-            <TableCell className="whitespace-nowrap">
-              <div className="flex items-center gap-2">
-                <Avatar
-                  name={formatName(symptom.created_by)}
-                  className="w-4 h-4"
-                  imageUrl={symptom.created_by?.profile_picture_url}
-                />
-                <span className="text-sm">
-                  {formatName(symptom.created_by)}
-                </span>
-              </div>
-            </TableCell>
-          </TableRow>
-        ))}
+                <TableCell className="font-medium">
+                  {symptom.code.display}
+                </TableCell>
+                <TableCell>
+                  <Badge
+                    variant="outline"
+                    className={`whitespace-nowrap ${getStatusBadgeStyle(symptom.clinical_status)}`}
+                  >
+                    {t(symptom.clinical_status)}
+                  </Badge>
+                </TableCell>
+                <TableCell>
+                  <Badge variant={"secondary"} className="whitespace-nowrap">
+                    {t(symptom.severity)}
+                  </Badge>
+                </TableCell>
+                <TableCell className="whitespace-nowrap">
+                  {symptom.onset?.onset_datetime
+                    ? new Date(
+                        symptom.onset.onset_datetime,
+                      ).toLocaleDateString()
+                    : "-"}
+                </TableCell>
+                <TableCell>
+                  <Badge
+                    variant={isEnteredInError ? "destructive" : "outline"}
+                    className="whitespace-nowrap capitalize"
+                  >
+                    {t(symptom.verification_status)}
+                  </Badge>
+                </TableCell>
+                <TableCell className="max-w-[200px] truncate">
+                  {symptom.note || "-"}
+                </TableCell>
+                <TableCell className="whitespace-nowrap flex items-center gap-2">
+                  <Avatar
+                    name={formatName(symptom.created_by)}
+                    className="w-4 h-4"
+                    imageUrl={symptom.created_by?.profile_picture_url}
+                  />
+                  <span className="text-sm">
+                    {formatName(symptom.created_by)}
+                  </span>
+                </TableCell>
+              </TableRow>
+            </>
+          );
+        })}
       </TableBody>
     </Table>
   );
diff --git a/src/components/Patient/symptoms/list.tsx b/src/components/Patient/symptoms/list.tsx
index 64100b7ca1f..24f7a8142c8 100644
--- a/src/components/Patient/symptoms/list.tsx
+++ b/src/components/Patient/symptoms/list.tsx
@@ -2,8 +2,9 @@ import { useQuery } from "@tanstack/react-query";
 import { t } from "i18next";
 import { PencilIcon } from "lucide-react";
 import { Link } from "raviger";
-import { ReactNode } from "react";
+import { ReactNode, useState } from "react";
 
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 
@@ -23,6 +24,8 @@ export function SymptomsList({
   encounterId,
   facilityId,
 }: SymptomsListProps) {
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
+
   const { data: symptoms, isLoading } = useQuery({
     queryKey: ["symptoms", patientId, encounterId],
     queryFn: query(symptomApi.listSymptoms, {
@@ -43,14 +46,23 @@ export function SymptomsList({
     );
   }
 
-  if (!symptoms?.results?.length) {
+  const filteredSymptoms = symptoms?.results?.filter(
+    (symptom) =>
+      showEnteredInError || symptom.verification_status !== "entered_in_error",
+  );
+
+  const hasEnteredInErrorRecords = symptoms?.results?.some(
+    (symptom) => symptom.verification_status === "entered_in_error",
+  );
+
+  if (!filteredSymptoms?.length) {
     return (
       <SymptomListLayout
         facilityId={facilityId}
         patientId={patientId}
         encounterId={encounterId}
       >
-        <p className="text-muted-foreground">No symptoms recorded</p>
+        <p className="text-muted-foreground">{t("no_symptoms_recorded")}</p>
       </SymptomListLayout>
     );
   }
@@ -61,7 +73,31 @@ export function SymptomsList({
       patientId={patientId}
       encounterId={encounterId}
     >
-      <SymptomTable symptoms={symptoms.results} />
+      <SymptomTable
+        symptoms={[
+          ...filteredSymptoms.filter(
+            (symptom) => symptom.verification_status !== "entered_in_error",
+          ),
+          ...(showEnteredInError
+            ? filteredSymptoms.filter(
+                (symptom) => symptom.verification_status === "entered_in_error",
+              )
+            : []),
+        ]}
+      />
+
+      {hasEnteredInErrorRecords && !showEnteredInError && (
+        <div className="flex justify-start">
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={() => setShowEnteredInError(true)}
+            className="text-xs underline text-gray-500"
+          >
+            {t("view_all")}
+          </Button>
+        </div>
+      )}
     </SymptomListLayout>
   );
 }
@@ -91,7 +127,7 @@ const SymptomListLayout = ({
           </Link>
         )}
       </CardHeader>
-      <CardContent>{children}</CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };
diff --git a/src/components/Questionnaire/QuestionRenderer.tsx b/src/components/Questionnaire/QuestionRenderer.tsx
index b4f5168c60e..d63aa0e4cf7 100644
--- a/src/components/Questionnaire/QuestionRenderer.tsx
+++ b/src/components/Questionnaire/QuestionRenderer.tsx
@@ -3,7 +3,10 @@ import { useEffect, useRef } from "react";
 import { cn } from "@/lib/utils";
 
 import { QuestionValidationError } from "@/types/questionnaire/batch";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import {
   Question,
   StructuredQuestionType,
@@ -20,7 +23,7 @@ const FULL_WIDTH_QUESTION_TYPES: StructuredQuestionType[] = [
 interface QuestionRendererProps {
   questions: Question[];
   responses: QuestionnaireResponse[];
-  onResponseChange: (responses: QuestionnaireResponse[]) => void;
+  onResponseChange: (values: ResponseValue[], questionId: string) => void;
   errors: QuestionValidationError[];
   clearError: (questionId: string) => void;
   disabled?: boolean;
@@ -53,18 +56,12 @@ export function QuestionRenderer({
     }
   }, [activeGroupId]);
 
-  const handleResponseChange = (updatedResponse: QuestionnaireResponse) => {
-    const newResponses = [...responses];
-    const index = newResponses.findIndex(
-      (r) => r.question_id === updatedResponse.question_id,
-    );
-    if (index !== -1) {
-      newResponses[index] = updatedResponse;
-    } else {
-      newResponses.push(updatedResponse);
-    }
-    onResponseChange(newResponses);
-  };
+  // const handleResponseChange = (
+  //   updatedResponse: ResponseValue[],
+  //   questionId: string,
+  // ) => {
+  //   onResponseChange(newResponses, questionId);
+  // };
 
   const shouldBeFullWidth = (question: Question): boolean =>
     question.type === "structured" &&
@@ -86,7 +83,7 @@ export function QuestionRenderer({
             question={question}
             encounterId={encounterId}
             questionnaireResponses={responses}
-            updateQuestionnaireResponseCB={handleResponseChange}
+            updateQuestionnaireResponseCB={onResponseChange}
             errors={errors}
             clearError={clearError}
             disabled={disabled}
diff --git a/src/components/Questionnaire/QuestionTypes/AllergyQuestion.tsx b/src/components/Questionnaire/QuestionTypes/AllergyQuestion.tsx
index 8ccc6512821..8270ae98c71 100644
--- a/src/components/Questionnaire/QuestionTypes/AllergyQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/AllergyQuestion.tsx
@@ -53,14 +53,21 @@ import {
 } from "@/types/emr/allergyIntolerance/allergyIntolerance";
 import allergyIntoleranceApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi";
 import { Code } from "@/types/questionnaire/code";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import { Question } from "@/types/questionnaire/question";
 
 interface AllergyQuestionProps {
   patientId: string;
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -126,15 +133,15 @@ export function AllergyQuestion({
 
   useEffect(() => {
     if (patientAllergies?.results) {
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [
+      updateQuestionnaireResponseCB(
+        [
           {
             type: "allergy_intolerance",
             value: patientAllergies.results.map(convertToAllergyRequest),
           },
         ],
-      });
+        questionnaireResponse.question_id,
+      );
     }
   }, [patientAllergies]);
 
@@ -143,18 +150,43 @@ export function AllergyQuestion({
       ...allergies,
       { ...ALLERGY_INITIAL_VALUE, code },
     ] as AllergyIntoleranceRequest[];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "allergy_intolerance", value: newAllergies }],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "allergy_intolerance", value: newAllergies }],
+      questionnaireResponse.question_id,
+    );
   };
 
   const handleRemoveAllergy = (index: number) => {
-    const newAllergies = allergies.filter((_, i) => i !== index);
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "allergy_intolerance", value: newAllergies }],
-    });
+    const allergy = allergies[index];
+    if (allergy.id) {
+      // For existing records, update verification status to entered_in_error
+      const newAllergies = allergies.map((a, i) =>
+        i === index
+          ? { ...a, verification_status: "entered_in_error" as const }
+          : a,
+      ) as AllergyIntoleranceRequest[];
+      updateQuestionnaireResponseCB(
+        [
+          {
+            type: "allergy_intolerance",
+            value: newAllergies,
+          },
+        ],
+        questionnaireResponse.question_id,
+      );
+    } else {
+      // For new records, remove them completely
+      const newAllergies = allergies.filter((_, i) => i !== index);
+      updateQuestionnaireResponseCB(
+        [
+          {
+            type: "allergy_intolerance",
+            value: newAllergies,
+          },
+        ],
+        questionnaireResponse.question_id,
+      );
+    }
   };
 
   const handleUpdateAllergy = (
@@ -164,10 +196,10 @@ export function AllergyQuestion({
     const newAllergies = allergies.map((allergy, i) =>
       i === index ? { ...allergy, ...updates } : allergy,
     );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "allergy_intolerance", value: newAllergies }],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "allergy_intolerance", value: newAllergies }],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
@@ -211,11 +243,13 @@ export function AllergyQuestion({
               <div
                 key={index}
                 className={`p-3 space-y-3 ${
-                  allergy.clinical_status === "inactive"
-                    ? "opacity-60"
-                    : allergy.clinical_status === "resolved"
-                      ? "line-through"
-                      : ""
+                  allergy.verification_status === "entered_in_error"
+                    ? "opacity-40 pointer-events-none"
+                    : allergy.clinical_status === "inactive"
+                      ? "opacity-60"
+                      : allergy.clinical_status === "resolved"
+                        ? "line-through"
+                        : ""
                 }`}
               >
                 <div className="flex items-center justify-between">
@@ -225,7 +259,7 @@ export function AllergyQuestion({
                       onValueChange={(value) =>
                         handleUpdateAllergy(index, { category: value })
                       }
-                      disabled={disabled}
+                      disabled={disabled || !!allergy.id}
                     >
                       <SelectTrigger className="h-8 w-[32px] px-0 [&>svg]:hidden flex items-center justify-center">
                         <SelectValue>
@@ -430,11 +464,13 @@ const AllergyTableRow = ({
   const [showNotes, setShowNotes] = useState(allergy.note !== undefined);
 
   const rowClassName = `group ${
-    allergy.clinical_status === "inactive"
-      ? "opacity-60"
-      : allergy.clinical_status === "resolved"
-        ? "line-through"
-        : ""
+    allergy.verification_status === "entered_in_error"
+      ? "opacity-40 pointer-events-none"
+      : allergy.clinical_status === "inactive"
+        ? "opacity-60"
+        : allergy.clinical_status === "resolved"
+          ? "line-through"
+          : ""
   }`;
 
   const handleNotesToggle = () => {
@@ -454,7 +490,7 @@ const AllergyTableRow = ({
           <Select
             value={allergy.category}
             onValueChange={(value) => onUpdate?.({ category: value })}
-            disabled={disabled}
+            disabled={disabled || !!allergy.id}
           >
             <SelectTrigger className="h-7 w-[32px] px-0 [&>svg]:hidden flex items-center justify-center">
               <SelectValue
diff --git a/src/components/Questionnaire/QuestionTypes/AppointmentQuestion.tsx b/src/components/Questionnaire/QuestionTypes/AppointmentQuestion.tsx
index 916f97018e5..7f30558df4f 100644
--- a/src/components/Questionnaire/QuestionTypes/AppointmentQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/AppointmentQuestion.tsx
@@ -33,7 +33,11 @@ import { UserBase } from "@/types/user/user";
 interface FollowUpVisitQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -54,15 +58,16 @@ export function AppointmentQuestion({
 
   const handleUpdate = (updates: Partial<CreateAppointmentQuestion>) => {
     const appointment = { ...value, ...updates };
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "appointment",
           value: [appointment] as unknown as ResponseValue["value"],
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   const facilityId = useSlug("facility");
diff --git a/src/components/Questionnaire/QuestionTypes/BooleanQuestion.tsx b/src/components/Questionnaire/QuestionTypes/BooleanQuestion.tsx
index b2b094790b4..fb360302835 100644
--- a/src/components/Questionnaire/QuestionTypes/BooleanQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/BooleanQuestion.tsx
@@ -1,13 +1,20 @@
 import { Label } from "@/components/ui/label";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { Question } from "@/types/questionnaire/question";
 
 interface BooleanQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
   clearError: () => void;
 }
@@ -24,15 +31,16 @@ export function BooleanQuestion({
       value={questionnaireResponse.values[0]?.value?.toString()}
       onValueChange={(value) => {
         clearError();
-        updateQuestionnaireResponseCB({
-          ...questionnaireResponse,
-          values: [
+        updateQuestionnaireResponseCB(
+          [
             {
               type: "boolean",
               value: value === "true",
             },
           ],
-        });
+          questionnaireResponse.question_id,
+          questionnaireResponse.note,
+        );
       }}
       disabled={disabled}
     >
diff --git a/src/components/Questionnaire/QuestionTypes/ChoiceQuestion.tsx b/src/components/Questionnaire/QuestionTypes/ChoiceQuestion.tsx
index 4c0f7259bef..95475f7acc5 100644
--- a/src/components/Questionnaire/QuestionTypes/ChoiceQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/ChoiceQuestion.tsx
@@ -9,14 +9,19 @@ import {
 } from "@/components/ui/select";
 
 import { properCase } from "@/Utils/utils";
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { AnswerOption, Question } from "@/types/questionnaire/question";
 
 interface ChoiceQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
   updateQuestionnaireResponseCB: (
-    questionnaireResponse: QuestionnaireResponse,
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
   ) => void;
   disabled?: boolean;
   withLabel?: boolean;
@@ -43,10 +48,11 @@ export const ChoiceQuestion = memo(function ChoiceQuestion({
       value: newValue,
     };
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: newValues,
-    });
+    updateQuestionnaireResponseCB(
+      newValues,
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   return (
diff --git a/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx b/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
index b20629e171c..9fa2e201157 100644
--- a/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
@@ -13,11 +13,18 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 
 interface DateTimeQuestionProps {
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
   clearError: () => void;
   classes?: string;
@@ -43,15 +50,16 @@ export function DateTimeQuestion({
       date.setMinutes(currentValue.getMinutes());
     }
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "dateTime",
           value: date.toISOString(),
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   const handleTimeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -62,15 +70,17 @@ export function DateTimeQuestion({
     date.setHours(hours);
     date.setMinutes(minutes);
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
+        ...questionnaireResponse.values,
         {
           type: "dateTime",
           value: date.toISOString(),
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   const formatTime = (date: Date | undefined) => {
diff --git a/src/components/Questionnaire/QuestionTypes/DiagnosisQuestion.tsx b/src/components/Questionnaire/QuestionTypes/DiagnosisQuestion.tsx
index da825a94a7d..b4aab2c07c4 100644
--- a/src/components/Questionnaire/QuestionTypes/DiagnosisQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/DiagnosisQuestion.tsx
@@ -8,6 +8,8 @@ import { format } from "date-fns";
 import { t } from "i18next";
 import React, { useEffect, useState } from "react";
 
+import { cn } from "@/lib/utils";
+
 import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -37,12 +39,19 @@ import {
 } from "@/types/emr/diagnosis/diagnosis";
 import diagnosisApi from "@/types/emr/diagnosis/diagnosisApi";
 import { Code } from "@/types/questionnaire/code";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 
 interface DiagnosisQuestionProps {
   patientId: string;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -94,15 +103,15 @@ export function DiagnosisQuestion({
 
   useEffect(() => {
     if (patientDiagnoses?.results) {
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [
+      updateQuestionnaireResponseCB(
+        [
           {
             type: "diagnosis",
             value: patientDiagnoses.results.map(convertToDiagnosisRequest),
           },
         ],
-      });
+        questionnaireResponse.question_id,
+      );
     }
   }, [patientDiagnoses]);
 
@@ -111,15 +120,15 @@ export function DiagnosisQuestion({
       ...diagnoses,
       { ...DIAGNOSIS_INITIAL_VALUE, code },
     ] as DiagnosisRequest[];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "diagnosis",
           value: newDiagnoses,
         },
       ],
-    });
+      questionnaireResponse.question_id,
+    );
   };
 
   const handleRemoveDiagnosis = (index: number) => {
@@ -131,27 +140,27 @@ export function DiagnosisQuestion({
           ? { ...d, verification_status: "entered_in_error" as const }
           : d,
       ) as DiagnosisRequest[];
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [
+      updateQuestionnaireResponseCB(
+        [
           {
             type: "diagnosis",
             value: newDiagnoses,
           },
         ],
-      });
+        questionnaireResponse.question_id,
+      );
     } else {
       // For new records, remove them completely
       const newDiagnoses = diagnoses.filter((_, i) => i !== index);
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [
+      updateQuestionnaireResponseCB(
+        [
           {
             type: "diagnosis",
             value: newDiagnoses,
           },
         ],
-      });
+        questionnaireResponse.question_id,
+      );
     }
   };
 
@@ -162,15 +171,15 @@ export function DiagnosisQuestion({
     const newDiagnoses = diagnoses.map((diagnosis, i) =>
       i === index ? { ...diagnosis, ...updates } : diagnosis,
     );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "diagnosis",
           value: newDiagnoses,
         },
       ],
-    });
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
@@ -223,7 +232,12 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
   const [showNotes, setShowNotes] = useState(Boolean(diagnosis.note));
 
   return (
-    <div className="group hover:bg-gray-50">
+    <div
+      className={cn("group hover:bg-gray-50", {
+        "opacity-40 pointer-events-none":
+          diagnosis.verification_status === "entered_in_error",
+      })}
+    >
       <div className="py-1 px-2 space-y-2 md:space-y-0 md:grid md:grid-cols-12 md:items-center md:gap-4">
         <div className="flex items-center justify-between md:col-span-5">
           <div
@@ -274,7 +288,7 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
                   onset: { onset_datetime: e.target.value },
                 })
               }
-              disabled={disabled}
+              disabled={disabled || !!diagnosis.id}
               className="h-8 md:h-9"
             />
           </div>
diff --git a/src/components/Questionnaire/QuestionTypes/EncounterQuestion.tsx b/src/components/Questionnaire/QuestionTypes/EncounterQuestion.tsx
index 61cc44e4a95..315221b64de 100644
--- a/src/components/Questionnaire/QuestionTypes/EncounterQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/EncounterQuestion.tsx
@@ -40,7 +40,11 @@ interface EncounterQuestionProps {
   question: Question;
   encounterId: string;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
   clearError: () => void;
   organizations?: string[];
@@ -124,10 +128,10 @@ export function EncounterQuestion({
       value: [encounterRequest] as unknown as typeof responseValue.value,
     };
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [responseValue],
-    });
+    updateQuestionnaireResponseCB(
+      [responseValue],
+      questionnaireResponse.question_id,
+    );
   };
 
   if (isLoading) {
diff --git a/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx b/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
index fdea9a249d3..fb2fb85fd54 100644
--- a/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
@@ -64,12 +64,19 @@ import {
 } from "@/types/emr/medicationRequest";
 import medicationRequestApi from "@/types/emr/medicationRequest/medicationRequestApi";
 import { Code } from "@/types/questionnaire/code";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 
 interface MedicationRequestQuestionProps {
   patientId: string;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -83,7 +90,7 @@ export function MedicationRequestQuestion({
     (questionnaireResponse.values?.[0]?.value as MedicationRequest[]) || [];
 
   const { data: patientMedications } = useQuery({
-    queryKey: ["medications", patientId],
+    queryKey: ["medication_requests", patientId],
     queryFn: query(medicationRequestApi.list, {
       pathParams: { patientId },
       queryParams: {
@@ -94,15 +101,10 @@ export function MedicationRequestQuestion({
 
   useEffect(() => {
     if (patientMedications?.results) {
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [
-          {
-            type: "medication_request",
-            value: patientMedications.results,
-          },
-        ],
-      });
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_request", value: patientMedications.results }],
+        questionnaireResponse.question_id,
+      );
     }
   }, [patientMedications]);
 
@@ -123,15 +125,10 @@ export function MedicationRequestQuestion({
         authored_on: new Date().toISOString(),
       },
     ];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
-        {
-          type: "medication_request",
-          value: newMedications,
-        },
-      ],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "medication_request", value: newMedications }],
+      questionnaireResponse.question_id,
+    );
     setExpandedMedicationIndex(newMedications.length - 1);
   };
 
@@ -150,19 +147,19 @@ export function MedicationRequestQuestion({
           ? { ...med, status: "entered_in_error" as const }
           : med,
       );
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [{ type: "medication_request", value: newMedications }],
-      });
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_request", value: newMedications }],
+        questionnaireResponse.question_id,
+      );
     } else {
       // For new records, remove them completely
       const newMedications = medications.filter(
         (_, i) => i !== medicationToDelete,
       );
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [{ type: "medication_request", value: newMedications }],
-      });
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_request", value: newMedications }],
+        questionnaireResponse.question_id,
+      );
     }
     setMedicationToDelete(null);
   };
@@ -175,15 +172,10 @@ export function MedicationRequestQuestion({
       i === index ? { ...medication, ...updates } : medication,
     );
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
-        {
-          type: "medication_request",
-          value: newMedications,
-        },
-      ],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "medication_request", value: newMedications }],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
@@ -394,6 +386,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
   const [showDosageDialog, setShowDosageDialog] = useState(false);
   const desktopLayout = useBreakpoints({ lg: true, default: false });
   const dosageInstruction = medication.dosage_instruction[0];
+  const isReadOnly = !!medication.id;
 
   const handleUpdateDosageInstruction = (
     updates: Partial<MedicationRequestDosageInstruction>,
@@ -432,7 +425,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                 },
               }));
             }}
-            disabled={disabled}
+            disabled={disabled || isReadOnly}
           />
         </div>
         <div>
@@ -449,7 +442,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                 },
               }));
             }}
-            disabled={disabled || !localDoseRange.low.value}
+            disabled={disabled || !localDoseRange.low.value || isReadOnly}
           />
         </div>
         <div className="flex justify-end gap-2">
@@ -478,7 +471,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               !localDoseRange.low.value ||
               !localDoseRange.high.value ||
               !localDoseRange.low.unit ||
-              !localDoseRange.high.unit
+              !localDoseRange.high.unit ||
+              isReadOnly
             }
           >
             {t("save")}
@@ -511,7 +505,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
       className={cn(
         "grid grid-cols-1 lg:grid-cols-[280px,180px,170px,160px,300px,180px,250px,180px,160px,200px,180px,48px] border-b hover:bg-gray-50/50",
         {
-          "opacity-50": medication.status === "entered_in_error",
+          "opacity-40 pointer-events-none":
+            medication.status === "entered_in_error",
         },
       )}
     >
@@ -551,7 +546,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                     },
                   });
                 }}
-                disabled={disabled}
+                disabled={disabled || isReadOnly}
               />
               <div className="flex justify-end">
                 <Button
@@ -559,6 +554,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                   size="icon"
                   className="h-3 w-3 rounded-full hover:bg-transparent"
                   onClick={handleDoseRangeClick}
+                  disabled={disabled || isReadOnly}
                 >
                   +
                 </Button>
@@ -618,7 +614,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               });
             }
           }}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         >
           <SelectTrigger className="h-9 text-sm">
             <SelectValue placeholder={t("select_frequency")} />
@@ -666,7 +662,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               disabled={
                 disabled ||
                 !dosageInstruction?.timing?.repeat ||
-                dosageInstruction?.as_needed_boolean
+                dosageInstruction?.as_needed_boolean ||
+                isReadOnly
               }
               className="h-9 text-sm"
             />
@@ -695,7 +692,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
             disabled={
               disabled ||
               !dosageInstruction?.timing?.repeat ||
-              dosageInstruction?.as_needed_boolean
+              dosageInstruction?.as_needed_boolean ||
+              isReadOnly
             }
           >
             <SelectTrigger className="h-9 text-sm w-24">
@@ -742,7 +740,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                 },
               },
             ]}
-            disabled={disabled}
+            disabled={disabled || isReadOnly}
           />
         ) : (
           <ValueSetSelect
@@ -754,7 +752,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               })
             }
             placeholder={t("select_additional_instructions")}
-            disabled={disabled}
+            disabled={disabled || isReadOnly}
           />
         )}
       </div>
@@ -766,7 +764,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
           value={dosageInstruction?.route}
           onSelect={(route) => handleUpdateDosageInstruction({ route })}
           placeholder={t("select_route")}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         />
       </div>
       {/* Site */}
@@ -777,7 +775,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
           value={dosageInstruction?.site}
           onSelect={(site) => handleUpdateDosageInstruction({ site })}
           placeholder={t("select_site")}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
           wrapTextForSmallScreen={true}
         />
       </div>
@@ -789,7 +787,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
           value={dosageInstruction?.method}
           onSelect={(method) => handleUpdateDosageInstruction({ method })}
           placeholder={t("select_method")}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
           count={20}
         />
       </div>
@@ -801,7 +799,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
           onValueChange={(value: MedicationRequestIntent) =>
             onUpdate?.({ intent: value })
           }
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         >
           <SelectTrigger className="h-9 text-sm capitalize">
             <SelectValue
@@ -833,7 +831,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
             if (!date) return;
             onUpdate?.({ authored_on: date.toISOString() });
           }}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         />
       </div>
       {/* Notes */}
@@ -862,8 +860,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               values: [],
               note: medication.note,
             }}
-            updateQuestionnaireResponseCB={(response) => {
-              onUpdate?.({ note: response.note });
+            handleUpdateNote={(note) => {
+              onUpdate?.({ note: note });
             }}
             disabled={disabled}
           />
diff --git a/src/components/Questionnaire/QuestionTypes/MedicationStatementQuestion.tsx b/src/components/Questionnaire/QuestionTypes/MedicationStatementQuestion.tsx
index 305094808f3..936a2b3b0b3 100644
--- a/src/components/Questionnaire/QuestionTypes/MedicationStatementQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/MedicationStatementQuestion.tsx
@@ -56,13 +56,18 @@ import {
 import medicationStatementApi from "@/types/emr/medicationStatement/medicationStatementApi";
 import { Code } from "@/types/questionnaire/code";
 import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import { ResponseValue } from "@/types/questionnaire/form";
 import { Question } from "@/types/questionnaire/question";
 
 interface MedicationStatementQuestionProps {
   patientId: string;
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -111,15 +116,10 @@ export function MedicationStatementQuestion({
 
   useEffect(() => {
     if (patientMedications?.results) {
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [
-          {
-            type: "medication_statement",
-            value: patientMedications.results,
-          },
-        ],
-      });
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_statement", value: patientMedications.results }],
+        questionnaireResponse.question_id,
+      );
     }
   }, [patientMedications]);
 
@@ -128,15 +128,10 @@ export function MedicationStatementQuestion({
       ...medications,
       { ...MEDICATION_STATEMENT_INITIAL_VALUE, medication },
     ];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
-        {
-          type: "medication_statement",
-          value: newMedications,
-        },
-      ],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "medication_statement", value: newMedications }],
+      questionnaireResponse.question_id,
+    );
     setExpandedMedicationIndex(newMedications.length - 1);
   };
 
@@ -155,19 +150,19 @@ export function MedicationStatementQuestion({
           ? { ...med, status: "entered_in_error" as const }
           : med,
       );
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [{ type: "medication_statement", value: newMedications }],
-      });
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_statement", value: newMedications }],
+        questionnaireResponse.question_id,
+      );
     } else {
       // For new records, remove them completely
       const newMedications = medications.filter(
         (_, i) => i !== medicationToDelete,
       );
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [{ type: "medication_statement", value: newMedications }],
-      });
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_statement", value: newMedications }],
+        questionnaireResponse.question_id,
+      );
     }
     setMedicationToDelete(null);
   };
@@ -180,15 +175,10 @@ export function MedicationStatementQuestion({
       i === index ? { ...medication, ...updates } : medication,
     );
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
-        {
-          type: "medication_statement",
-          value: newMedications,
-        },
-      ],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "medication_statement", value: newMedications }],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
@@ -390,9 +380,18 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
 }) => {
   const { t } = useTranslation();
   const desktopLayout = useBreakpoints({ lg: true, default: false });
+  const isReadOnly = !!medication.id;
 
   return (
-    <div className="grid grid-cols-1 lg:grid-cols-[300px,180px,170px,250px,260px,190px,200px,48px] border-b hover:bg-gray-50/50 gap-2 lg:gap-0">
+    <div
+      className={cn(
+        "grid grid-cols-1 lg:grid-cols-[300px,180px,170px,250px,260px,190px,200px,48px] border-b hover:bg-gray-50/50",
+        {
+          "opacity-40 pointer-events-none":
+            medication.status === "entered_in_error",
+        },
+      )}
+    >
       <div className="lg:p-4 lg:px-2 lg:py-1 flex items-center justify-between lg:justify-start lg:col-span-1 lg:border-r font-medium overflow-hidden text-sm">
         <h4 className="text-base font-semibold break-words line-clamp-2 hidden lg:block">
           {index + 1}. {medication.medication?.display}
@@ -407,7 +406,7 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
           onValueChange={(value: MedicationStatementInformationSourceType) =>
             onUpdate?.({ information_source: value })
           }
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         >
           <SelectTrigger className="h-9 text-sm capitalize">
             <SelectValue />
@@ -478,7 +477,7 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
           value={medication.dosage_text || ""}
           onChange={(e) => onUpdate?.({ dosage_text: e.target.value })}
           placeholder={t("enter_dosage_instructions")}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
           className="h-9 text-sm"
         />
       </div>
@@ -516,7 +515,7 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
           placeholder={t("reason_for_medication")}
           value={medication.reason || ""}
           onChange={(e) => onUpdate?.({ reason: e.target.value })}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
           className="h-9 text-sm"
         />
       </div>
@@ -547,8 +546,8 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
               values: [],
               note: medication.note,
             }}
-            updateQuestionnaireResponseCB={(response) => {
-              onUpdate?.({ note: response.note });
+            handleUpdateNote={(note) => {
+              onUpdate?.({ note: note });
             }}
             disabled={disabled}
           />
diff --git a/src/components/Questionnaire/QuestionTypes/NotesInput.tsx b/src/components/Questionnaire/QuestionTypes/NotesInput.tsx
index e6ec41120c0..5cbec9d3a5a 100644
--- a/src/components/Questionnaire/QuestionTypes/NotesInput.tsx
+++ b/src/components/Questionnaire/QuestionTypes/NotesInput.tsx
@@ -14,14 +14,14 @@ import type { QuestionnaireResponse } from "@/types/questionnaire/form";
 
 interface NotesInputProps {
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  handleUpdateNote: (note: string) => void;
   disabled?: boolean;
   className?: string;
 }
 
 export function NotesInput({
   questionnaireResponse,
-  updateQuestionnaireResponseCB,
+  handleUpdateNote,
   disabled,
   className,
 }: NotesInputProps) {
@@ -50,12 +50,7 @@ export function NotesInput({
         <PopoverContent className="bg-yellow-100 border border-yellow-200 text-gray-900 shadow-lg p-2">
           <Textarea
             value={notes}
-            onChange={(e) =>
-              updateQuestionnaireResponseCB({
-                ...questionnaireResponse,
-                note: e.target.value,
-              })
-            }
+            onChange={(e) => handleUpdateNote(e.target.value)}
             className=" border-yellow-200 focus-visible:border-yellow-300 focus-visible:ring-yellow-300"
             placeholder="Add notes..."
             disabled={disabled}
diff --git a/src/components/Questionnaire/QuestionTypes/NumberQuestion.tsx b/src/components/Questionnaire/QuestionTypes/NumberQuestion.tsx
index 354c4745453..f4480fa73df 100644
--- a/src/components/Questionnaire/QuestionTypes/NumberQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/NumberQuestion.tsx
@@ -1,12 +1,19 @@
 import { Input } from "@/components/ui/input";
 
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { Question } from "@/types/questionnaire/question";
 
 interface NumberQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -20,15 +27,16 @@ export function NumberQuestion({
     const numericValue =
       question.type === "decimal" ? parseFloat(value) : parseInt(value);
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "number",
           value: numericValue,
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   return (
diff --git a/src/components/Questionnaire/QuestionTypes/QuestionGroup.tsx b/src/components/Questionnaire/QuestionTypes/QuestionGroup.tsx
index f615964eeec..aeb8704b699 100644
--- a/src/components/Questionnaire/QuestionTypes/QuestionGroup.tsx
+++ b/src/components/Questionnaire/QuestionTypes/QuestionGroup.tsx
@@ -5,7 +5,10 @@ import { cn } from "@/lib/utils";
 import { QuestionLabel } from "@/components/Questionnaire/QuestionLabel";
 
 import { QuestionValidationError } from "@/types/questionnaire/batch";
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { EnableWhen, Question } from "@/types/questionnaire/question";
 
 import { QuestionInput } from "./QuestionInput";
@@ -14,7 +17,11 @@ interface QuestionGroupProps {
   question: Question;
   encounterId?: string;
   questionnaireResponses: QuestionnaireResponse[];
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   errors: QuestionValidationError[];
   clearError: (questionId: string) => void;
   disabled?: boolean;
diff --git a/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx b/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
index 87c913dbee7..b5e99f8da6c 100644
--- a/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
+++ b/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
@@ -32,7 +32,9 @@ interface QuestionInputProps {
   questionnaireResponses: QuestionnaireResponse[];
   encounterId?: string;
   updateQuestionnaireResponseCB: (
-    questionnaireResponse: QuestionnaireResponse,
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
   ) => void;
   errors: QuestionValidationError[];
   clearError: () => void;
@@ -61,20 +63,21 @@ export function QuestionInput({
   }
 
   const handleAddValue = () => {
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [...questionnaireResponse.values, { type: "string", value: "" }],
-    });
+    updateQuestionnaireResponseCB(
+      [...questionnaireResponse.values, { type: "string", value: "" }],
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   const removeValue = (index: number) => {
     const updatedValues = questionnaireResponse.values.filter(
       (_, i) => i !== index,
     );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: updatedValues,
-    });
+    updateQuestionnaireResponseCB(
+      updatedValues,
+      questionnaireResponse.question_id,
+    );
   };
 
   const renderSingleInput = (index: number = 0) => {
@@ -193,9 +196,13 @@ export function QuestionInput({
                         "mt-2": question.type === "text",
                       })}
                       questionnaireResponse={questionnaireResponse}
-                      updateQuestionnaireResponseCB={
-                        updateQuestionnaireResponseCB
-                      }
+                      handleUpdateNote={(note) => {
+                        updateQuestionnaireResponseCB(
+                          [...questionnaireResponse.values],
+                          questionnaireResponse.question_id,
+                          note,
+                        );
+                      }}
                       disabled={disabled}
                     />
                   )}
@@ -219,7 +226,13 @@ export function QuestionInput({
             </Button>
             <NotesInput
               questionnaireResponse={questionnaireResponse}
-              updateQuestionnaireResponseCB={updateQuestionnaireResponseCB}
+              handleUpdateNote={(note) => {
+                updateQuestionnaireResponseCB(
+                  [...questionnaireResponse.values],
+                  questionnaireResponse.question_id,
+                  note,
+                );
+              }}
               disabled={disabled}
             />
           </div>
diff --git a/src/components/Questionnaire/QuestionTypes/SymptomQuestion.tsx b/src/components/Questionnaire/QuestionTypes/SymptomQuestion.tsx
index 89f17bc6f1d..94eba927251 100644
--- a/src/components/Questionnaire/QuestionTypes/SymptomQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/SymptomQuestion.tsx
@@ -10,6 +10,8 @@ import { format } from "date-fns";
 import { t } from "i18next";
 import React, { useCallback, useEffect, useState } from "react";
 
+import { cn } from "@/lib/utils";
+
 import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -38,12 +40,19 @@ import {
 } from "@/types/emr/symptom/symptom";
 import symptomApi from "@/types/emr/symptom/symptomApi";
 import { Code } from "@/types/questionnaire/code";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 
 interface SymptomQuestionProps {
   patientId: string;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -173,7 +182,12 @@ const SymptomRow = React.memo(function SymptomRow({
   const handleToggleNotes = useCallback(() => setShowNotes((n) => !n), []);
 
   return (
-    <div className="group hover:bg-gray-50">
+    <div
+      className={cn("group hover:bg-gray-50", {
+        "opacity-40 pointer-events-none":
+          symptom.verification_status === "entered_in_error",
+      })}
+    >
       <div className="py-1 px-2 space-y-2 md:space-y-0 md:grid md:grid-cols-12 md:items-center md:gap-4">
         <div className="flex items-center justify-between md:col-span-5">
           <div
@@ -191,7 +205,7 @@ const SymptomRow = React.memo(function SymptomRow({
             type="date"
             value={symptom.onset?.onset_datetime || ""}
             onChange={handleDateChange}
-            disabled={disabled}
+            disabled={disabled || !!symptom.id}
             className="h-8 md:h-9"
           />
         </div>
@@ -283,15 +297,15 @@ export function SymptomQuestion({
 
   useEffect(() => {
     if (patientSymptoms?.results) {
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [
+      updateQuestionnaireResponseCB(
+        [
           {
             type: "symptom",
             value: patientSymptoms.results.map(convertToSymptomRequest),
           },
         ],
-      });
+        questionnaireResponse.question_id,
+      );
     }
   }, [patientSymptoms]);
 
@@ -300,10 +314,10 @@ export function SymptomQuestion({
       ...symptoms,
       { ...SYMPTOM_INITIAL_VALUE, code },
     ] as SymptomRequest[];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "symptom", value: newSymptoms }],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "symptom", value: newSymptoms }],
+      questionnaireResponse.question_id,
+    );
   };
 
   const handleRemoveSymptom = (index: number) => {
@@ -315,17 +329,17 @@ export function SymptomQuestion({
           ? { ...s, verification_status: "entered_in_error" as const }
           : s,
       );
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [{ type: "symptom", value: newSymptoms }],
-      });
+      updateQuestionnaireResponseCB(
+        [{ type: "symptom", value: newSymptoms }],
+        questionnaireResponse.question_id,
+      );
     } else {
       // For new records, remove them completely
       const newSymptoms = symptoms.filter((_, i) => i !== index);
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [{ type: "symptom", value: newSymptoms }],
-      });
+      updateQuestionnaireResponseCB(
+        [{ type: "symptom", value: newSymptoms }],
+        questionnaireResponse.question_id,
+      );
     }
   };
 
@@ -336,10 +350,10 @@ export function SymptomQuestion({
     const newSymptoms = symptoms.map((symptom, i) =>
       i === index ? { ...symptom, ...updates } : symptom,
     );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "symptom", value: newSymptoms }],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "symptom", value: newSymptoms }],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
diff --git a/src/components/Questionnaire/QuestionTypes/TextQuestion.tsx b/src/components/Questionnaire/QuestionTypes/TextQuestion.tsx
index fabd509328a..7f39b457b54 100644
--- a/src/components/Questionnaire/QuestionTypes/TextQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/TextQuestion.tsx
@@ -1,13 +1,20 @@
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { Question } from "@/types/questionnaire/question";
 
 interface TextQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
   clearError: () => void;
 }
@@ -21,15 +28,16 @@ export function TextQuestion({
 }: TextQuestionProps) {
   const handleChange = (value: string) => {
     clearError();
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "string",
           value,
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   return (
diff --git a/src/components/Questionnaire/QuestionnaireForm.tsx b/src/components/Questionnaire/QuestionnaireForm.tsx
index 97251af439c..59b89d2ae67 100644
--- a/src/components/Questionnaire/QuestionnaireForm.tsx
+++ b/src/components/Questionnaire/QuestionnaireForm.tsx
@@ -1,4 +1,4 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import { t } from "i18next";
 import { useNavigationPrompt } from "raviger";
 import { useEffect, useState } from "react";
@@ -22,7 +22,10 @@ import {
   QuestionValidationError,
   ValidationErrorResponse,
 } from "@/types/questionnaire/batch";
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { Question } from "@/types/questionnaire/question";
 import { QuestionnaireDetail } from "@/types/questionnaire/questionnaire";
 import questionnaireApi from "@/types/questionnaire/questionnaireApi";
@@ -64,12 +67,13 @@ export function QuestionnaireForm({
   onCancel,
   facilityId,
 }: QuestionnaireFormProps) {
-  const queryClient = useQueryClient();
+  // const queryClient = useQueryClient();
   const [isDirty, setIsDirty] = useState(false);
   const [questionnaireForms, setQuestionnaireForms] = useState<
     QuestionnaireFormState[]
   >([]);
   const [activeQuestionnaireId, setActiveQuestionnaireId] = useState<string>();
+
   const [activeGroupId, setActiveGroupId] = useState<string>();
   const [isInitialized, setIsInitialized] = useState(false);
 
@@ -88,7 +92,16 @@ export function QuestionnaireForm({
   const { mutate: submitBatch, isPending } = useMutation({
     mutationFn: mutate(routes.batchRequest, { silent: true }),
     onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["allergies", patientId] });
+      // queryClient.invalidateQueries({ queryKey: ["allergies", patientId] });
+      // queryClient.invalidateQueries({ queryKey: ["symptoms", patientId] });
+      // queryClient.invalidateQueries({ queryKey: ["medications", patientId] });
+      // queryClient.invalidateQueries({ queryKey: ["diagnoses", patientId] });
+      // queryClient.invalidateQueries({
+      //   queryKey: ["medication_statements", patientId],
+      // });
+      // queryClient.invalidateQueries({
+      //   queryKey: ["medication_requests", patientId],
+      // });
       toast.success(t("questionnaire_submitted_successfully"));
       onSubmit?.();
     },
@@ -347,11 +360,22 @@ export function QuestionnaireForm({
               encounterId={encounterId}
               questions={form.questionnaire.questions}
               responses={form.responses}
-              onResponseChange={(responses) => {
+              onResponseChange={(
+                values: ResponseValue[],
+                questionId: string,
+                note?: string,
+              ) => {
                 setQuestionnaireForms((existingForms) =>
                   existingForms.map((formItem) =>
                     formItem.questionnaire.id === form.questionnaire.id
-                      ? { ...formItem, responses }
+                      ? {
+                          ...formItem,
+                          responses: formItem.responses.map((r) =>
+                            r.question_id === questionId
+                              ? { ...r, values, note: note }
+                              : r,
+                          ),
+                        }
                       : formItem,
                   ),
                 );
diff --git a/src/components/ui/date-time-picker.tsx b/src/components/ui/date-time-picker.tsx
index e4874613c3c..26c93552596 100644
--- a/src/components/ui/date-time-picker.tsx
+++ b/src/components/ui/date-time-picker.tsx
@@ -73,9 +73,9 @@ export function DateTimePicker({
         >
           <CalendarIcon className="mr-2 h-4 w-4" />
           {value ? (
-            format(value, "MM/dd/yyyy hh:mm aa")
+            format(value, "dd/MM/yyyy hh:mm aa")
           ) : (
-            <span>MM/DD/YYYY hh:mm aa</span>
+            <span>DD/MM/YYYY hh:mm aa</span>
           )}
         </Button>
       </PopoverTrigger>
diff --git a/src/types/emr/allergyIntolerance/allergyIntolerance.ts b/src/types/emr/allergyIntolerance/allergyIntolerance.ts
index 606b8668757..6693664b0b5 100644
--- a/src/types/emr/allergyIntolerance/allergyIntolerance.ts
+++ b/src/types/emr/allergyIntolerance/allergyIntolerance.ts
@@ -9,14 +9,21 @@ export type AllergyVerificationStatus =
   | "entered_in_error";
 
 export type AllergyClinicalStatus = "active" | "inactive" | "resolved";
+export type AllergyCategory =
+  | "food"
+  | "medication"
+  | "environment"
+  | "biologic";
+export type AllergyCriticality = "low" | "high" | "unable_to_assess";
+
 // Base type for allergy data
 export interface AllergyIntolerance {
   id: string;
   code: Code;
   clinical_status: AllergyClinicalStatus;
   verification_status: AllergyVerificationStatus;
-  category: string;
-  criticality: string;
+  category: AllergyCategory;
+  criticality: AllergyCriticality;
   last_occurrence?: string;
   note?: string;
   created_by: UserBase;
diff --git a/src/types/emr/medicationStatement.ts b/src/types/emr/medicationStatement.ts
index d883e5af7bd..a357ddab63c 100644
--- a/src/types/emr/medicationStatement.ts
+++ b/src/types/emr/medicationStatement.ts
@@ -45,6 +45,7 @@ export type MedicationStatementRequest = {
   status: MedicationStatementStatus;
   reason?: string;
   medication: Code;
+  encounter?: string; // UUID
   dosage_text: string;
   effective_period?: Period;
   information_source: MedicationStatementInformationSourceType;
diff --git a/src/types/emr/symptom/symptom.ts b/src/types/emr/symptom/symptom.ts
index 16742fcedd9..d064fd320e4 100644
--- a/src/types/emr/symptom/symptom.ts
+++ b/src/types/emr/symptom/symptom.ts
@@ -40,7 +40,7 @@ export interface Symptom {
   code: Code;
   clinical_status: SymptomClinicalStatus;
   verification_status: SymptomVerificationStatus;
-  severity?: SymptomSeverity;
+  severity: SymptomSeverity;
   onset?: Onset;
   recorded_date?: string;
   note?: string;
@@ -53,7 +53,7 @@ export interface SymptomRequest {
   clinical_status: SymptomClinicalStatus;
   verification_status: SymptomVerificationStatus;
   code: Code;
-  severity?: SymptomSeverity;
+  severity: SymptomSeverity;
   onset?: Onset;
   recorded_date?: string;
   note?: string;