diff --git a/i18n/en.pot b/i18n/en.pot
index 7af66eb5a2..f69fbe22a0 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-07-25T09:21:55.558Z\n"
-"PO-Revision-Date: 2023-07-25T09:21:55.558Z\n"
+"POT-Creation-Date: 2023-07-25T09:23:57.018Z\n"
+"PO-Revision-Date: 2023-07-25T09:23:57.018Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -998,11 +998,6 @@ msgstr "You can also choose a program from the top bar and search in that progra
 msgid "Choose a type to start searching"
 msgstr "Choose a type to start searching"
 
-msgid "Fill in at least {{count}} attribute to search"
-msgid_plural "Fill in at least {{count}} attribute to search"
-msgstr[0] "Fill in at least {{count}} attribute to search"
-msgstr[1] "Fill in at least {{count}} attributes to search"
-
 msgid "Search {{name}}"
 msgstr "Search {{name}}"
 
@@ -1256,22 +1251,12 @@ msgstr "Scheduled automatically for {{suggestedScheduleDate}}"
 msgid "The scheduled date matches the suggested date, but can be changed if needed."
 msgstr "The scheduled date matches the suggested date, but can be changed if needed."
 
-msgid "The scheduled date is {{count}} days {{position}} the suggested date."
-msgid_plural "The scheduled date is {{count}} days {{position}} the suggested date."
-msgstr[0] "The scheduled date is {{count}} day {{position}} the suggested date."
-msgstr[1] "The scheduled date is {{count}} days {{position}} the suggested date."
-
 msgid "after"
 msgstr "after"
 
 msgid "before"
 msgstr "before"
 
-msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgid_plural "There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgstr[0] "There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgstr[1] "There are {{count}} scheduled events in {{orgUnitName}} on this day."
-
 msgid "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}"
 msgstr "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}"
 
diff --git a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useEnrollmentFormFoundation.js b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useEnrollmentFormFoundation.js
index 49a7b484be..94c7805875 100644
--- a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useEnrollmentFormFoundation.js
+++ b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useEnrollmentFormFoundation.js
@@ -30,7 +30,8 @@ export const useEnrollmentFormFoundation = ({
     locale,
 }: Props) => {
     const { data: enrollment, isLoading, error } = useIndexedDBQuery(
-        ['enrollmentForm', program?.id],
+        // $FlowFixMe
+        ['enrollmentForm', program.id],
         () => buildEnrollmentForm({
             // $FlowFixMe - Flow does not understand that the values are not null here
             cachedProgram: program,
diff --git a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useTrackedEntityTypeCollection.js b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useTrackedEntityTypeCollection.js
index ae3d4c3e5a..f8899708b0 100644
--- a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useTrackedEntityTypeCollection.js
+++ b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useTrackedEntityTypeCollection.js
@@ -26,7 +26,8 @@ export const useTrackedEntityTypeCollection = ({
     locale,
 }: Props): ReturnValues => {
     const { data: trackedEntityAttributes } = useIndexedDBQuery(
-        ['trackedEntityAttributes', trackedEntityType?.id],
+        // $FlowFixMe
+        ['trackedEntityAttributes', trackedEntityType.id],
         () => getTrackedEntityAttributes(
             trackedEntityType
                 ?.trackedEntityTypeAttributes
@@ -40,7 +41,8 @@ export const useTrackedEntityTypeCollection = ({
     );
 
     const { data: trackedEntityTypeCollection } = useIndexedDBQuery(
-        ['trackedEntityTypeCollection', trackedEntityType?.id],
+        // $FlowFixMe
+        ['trackedEntityTypeCollection', trackedEntityType.id],
         () => buildTrackedEntityTypeCollection({
             // $FlowFixMe
             cachedTrackedEntityType: trackedEntityType,