diff --git a/app/src/features/surveys/components/SamplingMethodForm.tsx b/app/src/features/surveys/components/SamplingMethodForm.tsx
index 59e5baaf21..e543b49318 100644
--- a/app/src/features/surveys/components/SamplingMethodForm.tsx
+++ b/app/src/features/surveys/components/SamplingMethodForm.tsx
@@ -138,7 +138,7 @@ const SamplingMethodForm = () => {
           )}
           <Stack component={TransitionGroup} gap={1.5}>
             {values.methods.map((item, index) => (
-              <Collapse key={`sample_method_${item.method_lookup_id}_${item.periods.length}`}>
+              <Collapse key={`sample_method_${item.method_lookup_id || Math.random()}`}>
                 <Card
                   variant="outlined"
                   sx={{
@@ -189,7 +189,7 @@ const SamplingMethodForm = () => {
                         <List dense disablePadding>
                           {item.periods.map((period) => (
                             <ListItem
-                              key={`sample_period_${period.survey_sample_period_id}`}
+                              key={`sample_period_${period.survey_sample_period_id || Math.random()}`}
                               divider
                               disableGutters
                               sx={{ pl: 1.25 }}>
diff --git a/database/src/migrations/20231207000001_update_api_set_context.ts b/database/src/migrations/20231207000001_update_api_set_context.ts
index 655251b09a..26baeb8037 100644
--- a/database/src/migrations/20231207000001_update_api_set_context.ts
+++ b/database/src/migrations/20231207000001_update_api_set_context.ts
@@ -9,6 +9,8 @@ import { Knex } from 'knex';
  */
 export async function up(knex: Knex): Promise<void> {
   await knex.raw(`
+    SET search_path = 'biohub';
+
     DROP FUNCTION IF EXISTS api_set_context;
 
     CREATE OR REPLACE FUNCTION api_set_context(p_system_user_guid system_user.user_guid%type, p_user_identity_source_name user_identity_source.name%type) RETURNS system_user.system_user_id%type