diff --git a/src/completed-list/completed-list.component.tsx b/src/completed-list/completed-list.component.tsx
index 09e60b7..dd3b0a3 100644
--- a/src/completed-list/completed-list.component.tsx
+++ b/src/completed-list/completed-list.component.tsx
@@ -43,7 +43,7 @@ export const CompletedList: React.FC<CompletedListProps> = ({
   // eslint-disable-next-line prefer-const
   let { workListEntries, isLoading } = useOrdersWorklist("", fulfillerStatus);
   workListEntries = workListEntries.filter(
-    (order) => order?.procedures[0]?.status == "COMPLETED"
+    (order) => order?.procedures?.length > 0
   );
   const [activatedOnOrAfterDate, setActivatedOnOrAfterDate] = useState("");
   const pageSizes = [10, 20, 30, 40, 50];
diff --git a/src/referred-procedures/referred-procedures.component.tsx b/src/referred-procedures/referred-procedures.component.tsx
index aab8eae..28a86d8 100644
--- a/src/referred-procedures/referred-procedures.component.tsx
+++ b/src/referred-procedures/referred-procedures.component.tsx
@@ -192,7 +192,7 @@ const WorkList: React.FC<WorklistProps> = ({ fulfillerStatus }) => {
           onClick={() => {
             launchOverlay(
               t("postProcedureResultForm", "Procedure report form"),
-              <PostProcedureForm patientUuid={patientUuid} procedure={order} />
+              <PostProcedureForm patientUuid={patientUuid} order={order} />
             );
           }}
           renderIcon={(props) => (
diff --git a/src/work-list/work-list.component.tsx b/src/work-list/work-list.component.tsx
index d376fd2..9398b3e 100644
--- a/src/work-list/work-list.component.tsx
+++ b/src/work-list/work-list.component.tsx
@@ -67,9 +67,9 @@ const WorkList: React.FC<WorklistProps> = ({ fulfillerStatus }) => {
 
   // eslint-disable-next-line prefer-const
   let { workListEntries, isLoading } = useOrdersWorklist("", fulfillerStatus);
-  // workListEntries = workListEntries.filter(
-  //   (order) => order?.procedures?.length == 0
-  // );
+  workListEntries = workListEntries.filter(
+    (order) => order?.procedures?.length == 0
+  );
   const [activatedOnOrAfterDate, setActivatedOnOrAfterDate] = useState("");
   const pageSizes = [10, 20, 30, 40, 50];
   const [currentPageSize, setPageSize] = useState(10);