diff --git a/www/i18n/en.json b/www/i18n/en.json
index b4c688b55..be884a2a5 100644
--- a/www/i18n/en.json
+++ b/www/i18n/en.json
@@ -356,6 +356,11 @@
         "error-loading-config-app-start": "Error loading config on app start",
         "survey-missing-formpath": "Error while fetching resources in config: survey_info.surveys has a survey without a formPath"
     },
+    "errors": {
+      "while-populating-composite": "Error while populating composite trips",
+      "while-loading-another-week": "Error while loading travel of {{when}} week",
+      "while-loading-specific-week": "Error while loading travel for the week of {{day}}"
+    },
     "consent-text": {
         "title":"NREL OPENPATH PRIVACY POLICY/TERMS OF USE",
         "introduction":{
diff --git a/www/js/appTheme.ts b/www/js/appTheme.ts
index 2fa1ab3f7..7571a564c 100644
--- a/www/js/appTheme.ts
+++ b/www/js/appTheme.ts
@@ -62,12 +62,15 @@ const flavorOverrides = {
       },
     }
   },
-  draft: { // for draft TripCards; a greyish color scheme
+  draft: { // for TripCards and LabelDetailsScreen of draft trips; a greyish color scheme
     colors: {
       primary: '#616971', // lch(44 6 250)
       primaryContainer: '#b6bcc2', // lch(76 4 250)
+      background: '#eef1f4', // lch(95 2 250)
+      surface: '#eef1f4', // lch(95 2 250)
+      surfaceDisabled: '#c7cacd', // lch(81 2 250)
       elevation: {
-        level1: '#dbddde', // lch(88 1 250)
+        level1: '#e1e3e4', // lch(90 1 250)
         level2: '#d2d5d8', // lch(85 2 250)
       },
     }
diff --git a/www/js/components/DiaryButton.tsx b/www/js/components/DiaryButton.tsx
index 00a097295..16c716f93 100644
--- a/www/js/components/DiaryButton.tsx
+++ b/www/js/components/DiaryButton.tsx
@@ -8,18 +8,13 @@ type Props = ButtonProps & { fillColor?: string, borderColor?: string };
 const DiaryButton = ({ children, fillColor, borderColor, icon, ...rest } : Props) => {
 
   const { colors } = useTheme();
-
-  const blackAlpha15 = color('black').alpha(0.15).rgb().string();
-  const style = {
-    borderColor: borderColor || (fillColor ? blackAlpha15 : colors.primary),
-    borderWidth: 1.5,
-  };
   const textColor = rest.textColor || (fillColor ? colors.onPrimary : colors.primary);
 
   return (
     <Button mode="elevated"
       textColor={textColor}
-      buttonColor={fillColor || colors.onPrimary} style={style}
+      buttonColor={fillColor || colors.onPrimary}
+      style={s.button(borderColor, fillColor, colors)}
       labelStyle={[s.label, {color: textColor}]}
       contentStyle={s.buttonContent}
       {...rest}>
@@ -34,7 +29,15 @@ const DiaryButton = ({ children, fillColor, borderColor, icon, ...rest } : Props
   );
 };
 
+const blackAlpha15 = color('black').alpha(0.15).rgb().string();
 const s = StyleSheet.create({
+  button: ((borderColor, fillColor, colors) => ({
+    width: '100%',
+    maxWidth: 200,
+    margin: 'auto',
+    borderColor: borderColor || (fillColor ? blackAlpha15 : colors.primary),
+    borderWidth: 1.5,
+  })) as any,
   buttonContent: {
     height: 25,
   },
diff --git a/www/js/components/ToggleSwitch.tsx b/www/js/components/ToggleSwitch.tsx
index 3b9b5cf25..5fdf1cc46 100644
--- a/www/js/components/ToggleSwitch.tsx
+++ b/www/js/components/ToggleSwitch.tsx
@@ -16,7 +16,7 @@ const ToggleSwitch = ({ value, buttons, ...rest}: SegmentedButtonsProps) => {
           minWidth: 0,
           borderTopWidth: rest.density == 'high' ? 0 : 1,
           borderBottomWidth: rest.density == 'high' ? 0 : 1,
-          backgroundColor: value == o.value ? colors.elevation.level2 : colors.surfaceDisabled,
+          backgroundColor: value == o.value ? colors.elevation.level1 : colors.surfaceDisabled,
         },
         ...o
       }))} {...rest} />
diff --git a/www/js/diary/LabelTab.tsx b/www/js/diary/LabelTab.tsx
index 37e5d300b..e90f8c060 100644
--- a/www/js/diary/LabelTab.tsx
+++ b/www/js/diary/LabelTab.tsx
@@ -20,6 +20,7 @@ import { compositeTrips2TimelineMap, getAllUnprocessedInputs, getLocalUnprocesse
 import { fillLocationNamesOfTrip, resetNominatimLimiter } from "./addressNamesHelper";
 import { SurveyOptions } from "../survey/survey";
 import { getLabelOptions } from "../survey/multilabel/confirmHelper";
+import { displayError } from "../plugin/logger";
 import AppStatusModal from "../control/AppStatusModal";
 import { useTheme } from "react-native-paper";
 
@@ -136,39 +137,49 @@ const LabelTab = () => {
   }
 
   async function loadAnotherWeek(when: 'past'|'future') {
-    const reachedPipelineStart = queriedRange?.start_ts && queriedRange.start_ts <= pipelineRange.start_ts;
-    const reachedPipelineEnd = queriedRange?.end_ts && queriedRange.end_ts >= pipelineRange.end_ts;
+    try {
+      const reachedPipelineStart = queriedRange?.start_ts && queriedRange.start_ts <= pipelineRange.start_ts;
+      const reachedPipelineEnd = queriedRange?.end_ts && queriedRange.end_ts >= pipelineRange.end_ts;
 
-    if (!queriedRange) {
-      // first time loading
-      if(!isLoading) setIsLoading('replace');
-      const nowTs = new Date().getTime() / 1000;
-      const [ctList, utList] = await fetchTripsInRange(pipelineRange.end_ts - ONE_WEEK, nowTs);
-      handleFetchedTrips(ctList, utList, 'replace');
-      setQueriedRange({start_ts: pipelineRange.end_ts - ONE_WEEK, end_ts: nowTs});
-    } else if (when == 'past' && !reachedPipelineStart) {
-      if(!isLoading) setIsLoading('prepend');
-      const fetchStartTs = Math.max(queriedRange.start_ts - ONE_WEEK, pipelineRange.start_ts);
-      const [ctList, utList] = await fetchTripsInRange(queriedRange.start_ts - ONE_WEEK, queriedRange.start_ts - 1);
-      handleFetchedTrips(ctList, utList, 'prepend');
-      setQueriedRange({start_ts: fetchStartTs, end_ts: queriedRange.end_ts})
-    } else if (when == 'future' && !reachedPipelineEnd) {
-      if(!isLoading) setIsLoading('append');
-      const fetchEndTs = Math.min(queriedRange.end_ts + ONE_WEEK, pipelineRange.end_ts);
-      const [ctList, utList] = await fetchTripsInRange(queriedRange.end_ts + 1, fetchEndTs);
-      handleFetchedTrips(ctList, utList, 'append');
-      setQueriedRange({start_ts: queriedRange.start_ts, end_ts: fetchEndTs})
+      if (!queriedRange) {
+        // first time loading
+        if(!isLoading) setIsLoading('replace');
+        const nowTs = new Date().getTime() / 1000;
+        const [ctList, utList] = await fetchTripsInRange(pipelineRange.end_ts - ONE_WEEK, nowTs);
+        handleFetchedTrips(ctList, utList, 'replace');
+        setQueriedRange({start_ts: pipelineRange.end_ts - ONE_WEEK, end_ts: nowTs});
+      } else if (when == 'past' && !reachedPipelineStart) {
+        if(!isLoading) setIsLoading('prepend');
+        const fetchStartTs = Math.max(queriedRange.start_ts - ONE_WEEK, pipelineRange.start_ts);
+        const [ctList, utList] = await fetchTripsInRange(queriedRange.start_ts - ONE_WEEK, queriedRange.start_ts - 1);
+        handleFetchedTrips(ctList, utList, 'prepend');
+        setQueriedRange({start_ts: fetchStartTs, end_ts: queriedRange.end_ts})
+      } else if (when == 'future' && !reachedPipelineEnd) {
+        if(!isLoading) setIsLoading('append');
+        const fetchEndTs = Math.min(queriedRange.end_ts + ONE_WEEK, pipelineRange.end_ts);
+        const [ctList, utList] = await fetchTripsInRange(queriedRange.end_ts + 1, fetchEndTs);
+        handleFetchedTrips(ctList, utList, 'append');
+        setQueriedRange({start_ts: queriedRange.start_ts, end_ts: fetchEndTs})
+      }
+    } catch (e) {
+      setIsLoading(false);
+      displayError(e, t('errors.while-loading-another-week', {when: when}));
     }
   }
 
   async function loadSpecificWeek(day: string) {
-    if (!isLoading) setIsLoading('replace');
-    resetNominatimLimiter();
-    const threeDaysBefore = moment(day).subtract(3, 'days').unix();
-    const threeDaysAfter = moment(day).add(3, 'days').unix();
-    const [ctList, utList] = await fetchTripsInRange(threeDaysBefore, threeDaysAfter);
-    handleFetchedTrips(ctList, utList, 'replace');
-    setQueriedRange({start_ts: threeDaysBefore, end_ts: threeDaysAfter});
+    try {
+      if (!isLoading) setIsLoading('replace');
+      resetNominatimLimiter();
+      const threeDaysBefore = moment(day).subtract(3, 'days').unix();
+      const threeDaysAfter = moment(day).add(3, 'days').unix();
+      const [ctList, utList] = await fetchTripsInRange(threeDaysBefore, threeDaysAfter);
+      handleFetchedTrips(ctList, utList, 'replace');
+      setQueriedRange({start_ts: threeDaysBefore, end_ts: threeDaysAfter});
+    } catch (e) {
+      setIsLoading(false);
+      displayError(e, t('errors.while-loading-specific-week', {day: day}));
+    }
   }
 
   function handleFetchedTrips(ctList, utList, mode: 'prepend' | 'append' | 'replace') {
diff --git a/www/js/diary/cards/ModesIndicator.tsx b/www/js/diary/cards/ModesIndicator.tsx
index d7e567fdf..5211f7ed4 100644
--- a/www/js/diary/cards/ModesIndicator.tsx
+++ b/www/js/diary/cards/ModesIndicator.tsx
@@ -31,7 +31,7 @@ const ModesIndicator = ({ trip, detectedModes, }) => {
         </Text>
       </View>
     );
-  } else if (detectedModes?.length > 1 || detectedModes[0]?.mode != 'UNKNOWN') {
+  } else if (detectedModes?.length > 1 || detectedModes?.length == 1 && detectedModes[0].mode != 'UNKNOWN') {
     // show detected modes if there are more than one, or if there is only one and it's not UNKNOWN
     modeViews = (<>
       <Text style={{fontSize: 12, fontWeight: '500'}}>{t('diary.detected')}</Text>
diff --git a/www/js/diary/cards/TripCard.tsx b/www/js/diary/cards/TripCard.tsx
index c0b5bbf5a..5414b9228 100644
--- a/www/js/diary/cards/TripCard.tsx
+++ b/www/js/diary/cards/TripCard.tsx
@@ -41,7 +41,8 @@ const TripCard = ({ trip }: Props) => {
   const flavoredTheme = getTheme(isDraft ? 'draft' : undefined);
 
   function showDetail() {
-    navigation.navigate("label.details", { tripId: trip._id.$oid });
+    const tripId = trip._id.$oid;
+    navigation.navigate("label.details", { tripId, flavoredTheme });
   }
 
   const mapOpts = { zoomControl: false, dragging: false };
diff --git a/www/js/diary/details/LabelDetailsScreen.tsx b/www/js/diary/details/LabelDetailsScreen.tsx
index 669b301de..ffed9a300 100644
--- a/www/js/diary/details/LabelDetailsScreen.tsx
+++ b/www/js/diary/details/LabelDetailsScreen.tsx
@@ -4,7 +4,7 @@
 
 import React, { useContext, useState } from "react";
 import { View, Modal, ScrollView, useWindowDimensions } from "react-native";
-import { Appbar, SegmentedButtons, Button, Surface, Text, useTheme } from "react-native-paper";
+import { PaperProvider, Appbar, SegmentedButtons, Button, Surface, Text, useTheme } from "react-native-paper";
 import { LabelTabContext } from "../LabelTab";
 import LeafletView from "../../components/LeafletView";
 import { useTranslation } from "react-i18next";
@@ -24,8 +24,9 @@ const LabelScreenDetails = ({ route, navigation }) => {
   const { surveyOpt, timelineMap, labelOptions } = useContext(LabelTabContext);
   const { t } = useTranslation();
   const { height: windowHeight } = useWindowDimensions();
-  const { colors } = useTheme();
-  const trip = timelineMap.get(route.params.tripId);
+  const { tripId, flavoredTheme } = route.params;
+  const trip = timelineMap.get(tripId);
+  const { colors } = flavoredTheme || useTheme();
   const { displayDate, displayStartTime, displayEndTime } = useDerivedProperties(trip);
   const [ tripStartDisplayName, tripEndDisplayName ] = useAddressNames(trip);
 
@@ -33,10 +34,10 @@ const LabelScreenDetails = ({ route, navigation }) => {
   const tripGeojson = useGeojsonForTrip(trip, labelOptions, modesShown=='labeled' && trip?.userInput?.MODE?.value);
   const mapOpts = {minZoom: 3, maxZoom: 17};
 
-  return (
+  const modal = (
     <Modal visible={true}>
       <SafeAreaView style={{flex: 1}}>
-        <Appbar.Header statusBarHeight={0} elevated={true} style={{ height: 46, backgroundColor: 'white', elevation: 3 }}>
+        <Appbar.Header statusBarHeight={0} elevated={true} style={{ height: 46, backgroundColor: colors.surface, elevation: 3 }}>
           <Appbar.BackAction onPress={() => { navigation.goBack() }} />
           <Appbar.Content title={displayDate} titleStyle={{fontSize: 17}} />
         </Appbar.Header>
@@ -45,8 +46,9 @@ const LabelScreenDetails = ({ route, navigation }) => {
             displayStartTime={displayStartTime} displayEndTime={displayEndTime}
             displayStartName={tripStartDisplayName} displayEndName={tripEndDisplayName} />
         </Surface>
-        <ScrollView style={{ paddingBottom: 30}}>
-          <Surface mode='flat' style={{padding: 10, marginHorizontal: 10, rowGap: 12 }}>
+        <ScrollView style={{ paddingBottom: 30, backgroundColor: colors.background }}>
+          <Surface mode='flat'
+            style={{margin: 10, paddingHorizontal: 10, rowGap: 12, borderRadius: 15 }}>
             {/* MultiLabel or UserInput button, inline on one row */}
             <View style={{ paddingVertical: 10 }}>
               {surveyOpt?.elementTag == 'multilabel' &&
@@ -83,7 +85,15 @@ const LabelScreenDetails = ({ route, navigation }) => {
         </ScrollView>
       </SafeAreaView>
     </Modal>
-  )
+  );
+  if (route.params.flavoredTheme) {
+    return (
+      <PaperProvider theme={route.params.flavoredTheme}>
+        {modal}
+      </PaperProvider>
+    );
+  }
+  return modal;
 }
 
 export default LabelScreenDetails;
diff --git a/www/js/diary/details/TripSectionsDescriptives.tsx b/www/js/diary/details/TripSectionsDescriptives.tsx
index 09086e4a7..6d172fed4 100644
--- a/www/js/diary/details/TripSectionsDescriptives.tsx
+++ b/www/js/diary/details/TripSectionsDescriptives.tsx
@@ -3,7 +3,7 @@ import { View } from 'react-native';
 import { Text, useTheme } from 'react-native-paper'
 import { Icon } from '../../components/Icon';
 import useDerivedProperties from '../useDerivedProperties';
-import { getBaseModeOfLabeledTrip } from '../diaryHelper';
+import { getBaseModeByKey, getBaseModeOfLabeledTrip } from '../diaryHelper';
 import { LabelTabContext } from '../LabelTab';
 
 const TripSectionsDescriptives = ({ trip, showLabeledMode=false }) => {
@@ -15,15 +15,22 @@ const TripSectionsDescriptives = ({ trip, showLabeledMode=false }) => {
   const { colors } = useTheme();
 
   let sections = formattedSectionProperties;
-  if (showLabeledMode && trip?.userInput?.MODE) {
-    const baseMode = getBaseModeOfLabeledTrip(trip, labelOptions);
+  /* if we're only showing the labeled mode, or there are no sections (i.e. unprocessed trip),
+    we treat this as unimodal and use trip-level attributes to construct a single section */
+  if (showLabeledMode && trip?.userInput?.MODE || !trip.sections?.length) {
+    let baseMode;
+    if (showLabeledMode && trip?.userInput?.MODE) {
+      baseMode = getBaseModeOfLabeledTrip(trip, labelOptions);
+    } else {
+      baseMode = getBaseModeByKey('UNPROCESSED');
+    }
     sections = [{
       startTime: displayStartTime,
       duration: displayTime,
       distance: formattedDistance,
       color: baseMode.color,
       icon: baseMode.icon,
-      text: trip.userInput.MODE.text,
+      text: showLabeledMode && trip.userInput?.MODE?.text, // label text only shown for labeled trips
     }];
   }
   return (
diff --git a/www/js/diary/services.js b/www/js/diary/services.js
index e9aad667f..0891b9103 100644
--- a/www/js/diary/services.js
+++ b/www/js/diary/services.js
@@ -265,8 +265,14 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
 
           return {
             ...tripProps,
-            start_loc: tripStartPoint.data.loc,
-            end_loc: tripEndPoint.data.loc,
+            start_loc: {
+              type: "Point",
+              coordinates: [tripStartPoint.data.longitude, tripStartPoint.data.latitude]
+            },
+            end_loc: {
+              type: "Point",
+              coordinates: [tripEndPoint.data.longitude, tripEndPoint.data.latitude],
+            },
           }
         });
     }
@@ -327,8 +333,12 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
                 // anyway.
 
                 Logger.log("mapped trips to trip_gj_list of size "+raw_trip_gj_list.length);
-                var trip_gj_list = raw_trip_gj_list.filter(angular.isDefined);
-                Logger.log("after filtering undefined, trip_gj_list size = "+raw_trip_gj_list.length);
+                /* Filtering: we will keep trips that are 1) defined and 2) have a distance >= 100m or duration >= 5 minutes
+                  https://github.com/e-mission/e-mission-docs/issues/966#issuecomment-1709112578 */
+                const trip_gj_list = raw_trip_gj_list.filter((trip) => 
+                  trip && (trip.distance >= 100 || trip.duration >= 300)
+                );
+                Logger.log("after filtering undefined and distance < 100, trip_gj_list size = "+raw_trip_gj_list.length);
                 // Link 0th trip to first, first to second, ...
                 for (var i = 0; i < trip_gj_list.length-1; i++) {
                     linkTrips(trip_gj_list[i], trip_gj_list[i+1]);
diff --git a/www/js/diary/timelineHelper.ts b/www/js/diary/timelineHelper.ts
index a5cfa42d3..579e3ac4f 100644
--- a/www/js/diary/timelineHelper.ts
+++ b/www/js/diary/timelineHelper.ts
@@ -1,7 +1,8 @@
 import moment from "moment";
 import { getAngularService } from "../angular-react-helper";
-import { logDebug } from "../plugin/logger";
+import { displayError, logDebug } from "../plugin/logger";
 import { getBaseModeByKey, getBaseModeOfLabeledTrip } from "./diaryHelper";
+import i18next from "i18next";
 
 const cachedGeojsons = new Map();
 /**
@@ -70,25 +71,29 @@ export function compositeTrips2TimelineMap(ctList: any[], unpackPlaces?: boolean
 }
 
 export function populateCompositeTrips(ctList, showPlaces, labelsFactory, labelsResultMap, notesFactory, notesResultMap) {
-  ctList.forEach((ct, i) => {
-    if (showPlaces && ct.start_confirmed_place) {
-      const cp = ct.start_confirmed_place;
-      cp.getNextEntry = () => ctList[i];
-      labelsFactory.populateInputsAndInferences(cp, labelsResultMap);
-      notesFactory.populateInputsAndInferences(cp, notesResultMap);
-    }
-    if (showPlaces && ct.end_confirmed_place) {
-      const cp = ct.end_confirmed_place;
-      cp.getNextEntry = () => ctList[i + 1];
-      labelsFactory.populateInputsAndInferences(cp, labelsResultMap);
-      notesFactory.populateInputsAndInferences(cp, notesResultMap);
-      ct.getNextEntry = () => cp;
-    } else {
-      ct.getNextEntry = () => ctList[i + 1];
-    }
-    labelsFactory.populateInputsAndInferences(ct, labelsResultMap);
-    notesFactory.populateInputsAndInferences(ct, notesResultMap);
-  });
+  try {
+    ctList.forEach((ct, i) => {
+      if (showPlaces && ct.start_confirmed_place) {
+        const cp = ct.start_confirmed_place;
+        cp.getNextEntry = () => ctList[i];
+        labelsFactory.populateInputsAndInferences(cp, labelsResultMap);
+        notesFactory.populateInputsAndInferences(cp, notesResultMap);
+      }
+      if (showPlaces && ct.end_confirmed_place) {
+        const cp = ct.end_confirmed_place;
+        cp.getNextEntry = () => ctList[i + 1];
+        labelsFactory.populateInputsAndInferences(cp, labelsResultMap);
+        notesFactory.populateInputsAndInferences(cp, notesResultMap);
+        ct.getNextEntry = () => cp;
+      } else {
+        ct.getNextEntry = () => ctList[i + 1];
+      }
+      labelsFactory.populateInputsAndInferences(ct, labelsResultMap);
+      notesFactory.populateInputsAndInferences(ct, notesResultMap);
+    });
+  } catch (e) {
+    displayError(e, i18next.t('errors.while-populating-composite'));
+  }
 }
 
 const getUnprocessedInputQuery = (pipelineRange) => ({
diff --git a/www/js/plugin/logger.ts b/www/js/plugin/logger.ts
index 05e684bbc..c4e476de1 100644
--- a/www/js/plugin/logger.ts
+++ b/www/js/plugin/logger.ts
@@ -43,7 +43,7 @@ export function displayErrorMsg(errorMsg: string, title?: string) {
   if (errorMsg.includes?.("403")) {
     title = "Invalid OPcode: " + (title || '');
   }
-  const displayMsg = title ? title + '\n' + errorMsg : errorMsg;
+  const displayMsg = `━━━━\n${title}\n━━━━\n` + errorMsg;
   window.alert(displayMsg);
   console.error(displayMsg);
   window['Logger'].log(window['Logger'].LEVEL_ERROR, displayMsg);
diff --git a/www/js/survey/enketo/AddNoteButton.tsx b/www/js/survey/enketo/AddNoteButton.tsx
index f0dd4ea26..1b85c728e 100644
--- a/www/js/survey/enketo/AddNoteButton.tsx
+++ b/www/js/survey/enketo/AddNoteButton.tsx
@@ -13,6 +13,7 @@ import { useTranslation } from "react-i18next";
 import moment from "moment";
 import { LabelTabContext } from "../../diary/LabelTab";
 import EnketoModal from "./EnketoModal";
+import { displayErrorMsg, logDebug } from "../../plugin/logger";
 
 type Props = {
   timelineEntry: any,
@@ -83,10 +84,10 @@ const AddNoteButton = ({ timelineEntry, notesConfig, storeKey }: Props) => {
 
   function onResponseSaved(result) {
     if (result) {
-      console.log('AddNoteButton: response was saved, about to repopulateTimelineEntry; result=', result);
+      logDebug('AddNoteButton: response was saved, about to repopulateTimelineEntry; result=' + JSON.stringify(result));
       repopulateTimelineEntry(timelineEntry._id.$oid);
     } else {
-      console.error('AddNoteButton: response was not saved, result=', result);
+      displayErrorMsg('AddNoteButton: response was not saved, result=', result);
     }
   }
 
diff --git a/www/js/survey/enketo/UserInputButton.tsx b/www/js/survey/enketo/UserInputButton.tsx
index a93fff0ac..68d0ae944 100644
--- a/www/js/survey/enketo/UserInputButton.tsx
+++ b/www/js/survey/enketo/UserInputButton.tsx
@@ -8,13 +8,14 @@
   The start and end times of the addition are the same as the trip or place.
 */
 
-import React, { useEffect, useState } from "react";
+import React, { useContext, useMemo, useState } from "react";
 import { getAngularService } from "../../angular-react-helper";
 import DiaryButton from "../../components/DiaryButton";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "react-native-paper";
-import { logDebug } from "../../plugin/logger";
+import { displayErrorMsg, logDebug } from "../../plugin/logger";
 import EnketoModal from "./EnketoModal";
+import { LabelTabContext } from "../../diary/LabelTab";
 
 type Props = {
   timelineEntry: any,
@@ -23,22 +24,17 @@ const UserInputButton = ({ timelineEntry }: Props) => {
   const { colors } = useTheme();
   const { t, i18n } = useTranslation();
 
-  // initial label "Add Trip Details"; will be filled after a survey response is recorded
-  const [displayLabel, setDisplayLabel] = useState(t('diary.choose-survey'));
-  const [isFilled, setIsFilled] = useState(false);
   const [prevSurveyResponse, setPrevSurveyResponse] = useState(null);
   const [modalVisible, setModalVisible] = useState(false);
+  const { repopulateTimelineEntry } = useContext(LabelTabContext);
 
   const EnketoTripButtonService = getAngularService("EnketoTripButtonService");
   const etbsSingleKey = EnketoTripButtonService.SINGLE_KEY;
 
-  useEffect(() => {
-    const isFilled = timelineEntry.userInput?.[etbsSingleKey];
-    if (isFilled) {
-      setDisplayLabel(timelineEntry.userInput[etbsSingleKey].data.label);
-      setIsFilled(true);
-    }
-  }, []);
+  // the label resolved from the survey response, or null if there is no response yet
+  const responseLabel = useMemo<string|null>(() => (
+    timelineEntry.userInput?.[etbsSingleKey]?.data?.label || null
+  ), [timelineEntry]);
 
   function launchUserInputSurvey() {
     logDebug('UserInputButton: About to launch survey');
@@ -48,19 +44,19 @@ const UserInputButton = ({ timelineEntry }: Props) => {
   }
 
   function onResponseSaved(result) {
-    if (!result) return;
-    timelineEntry.userInput[etbsSingleKey] = {
-      data: result,
-      write_ts: Date.now()
+    if (result) {
+      logDebug('UserInputButton: response was saved, about to repopulateTimelineEntry; result=' + JSON.stringify(result));
+      repopulateTimelineEntry(timelineEntry._id.$oid);
+    } else {
+      displayErrorMsg('UserInputButton: response was not saved, result=', result);
     }
-    setDisplayLabel(result.label);
-    setIsFilled(true);
   }
 
   return (<>
-    <DiaryButton fillColor={isFilled && colors.primary}
+    <DiaryButton fillColor={responseLabel && colors.primary}
       onPress={() => launchUserInputSurvey()}>
-      {displayLabel}
+      {/* if no response yet, show the default label */}
+      {responseLabel || t('diary.choose-survey')}
     </DiaryButton>
 
     <EnketoModal visible={modalVisible}
diff --git a/www/js/survey/multilabel/MultiLabelButtonGroup.tsx b/www/js/survey/multilabel/MultiLabelButtonGroup.tsx
index a10f58e55..cb14c61ea 100644
--- a/www/js/survey/multilabel/MultiLabelButtonGroup.tsx
+++ b/www/js/survey/multilabel/MultiLabelButtonGroup.tsx
@@ -10,7 +10,7 @@ import DiaryButton from "../../components/DiaryButton";
 import { useTranslation } from "react-i18next";
 import { LabelTabContext } from "../../diary/LabelTab";
 import { displayErrorMsg, logDebug } from "../../plugin/logger";
-import { getLabelInputDetails, getLabelInputs } from "./confirmHelper";
+import { getLabelInputDetails, getLabelInputs, readableLabelToKey } from "./confirmHelper";
 
 const MultilabelButtonGroup = ({ trip, buttonsInline=false }) => {
   const { colors } = useTheme();
@@ -55,7 +55,7 @@ const MultilabelButtonGroup = ({ trip, buttonsInline=false }) => {
     if (isOther) {
       /* Let's make the value for user entered inputs look consistent with our other values
        (i.e. lowercase, and with underscores instead of spaces) */
-      chosenLabel = chosenLabel.toLowerCase().replace(" ", "_");
+       chosenLabel = readableLabelToKey(chosenLabel);
     }
     const inputDataToStore = {
       "start_ts": trip.start_ts,
diff --git a/www/js/survey/multilabel/confirmHelper.ts b/www/js/survey/multilabel/confirmHelper.ts
index ef93e51aa..fdfea319f 100644
--- a/www/js/survey/multilabel/confirmHelper.ts
+++ b/www/js/survey/multilabel/confirmHelper.ts
@@ -101,18 +101,20 @@ export function getLabelInputDetails(appConfigParam?) {
 export const getLabelInputs = () => Object.keys(getLabelInputDetails());
 export const getBaseLabelInputs = () => Object.keys(baseLabelInputDetails);
 
-const otherValueToText = (otherValue) => {
-  const words = otherValue.replace("_", " ").split(" ");
+/** @description replace all underscores with spaces, and capitalizes the first letter of each word */
+export const labelKeyToReadable = (otherValue: string) => {
+  const words = otherValue.replace(/_/g, " ").trim().split(" ");
   if (words.length == 0) return "";
   return words.map((word) =>
     word[0].toUpperCase() + word.slice(1)
   ).join(" ");
 }
 
-const otherTextToValue = (otherText) =>
-  otherText.toLowerCase().replace(" ", "_");
+/** @description replaces all spaces with underscores, and lowercases the string */
+export const readableLabelToKey = (otherText: string) =>
+  otherText.trim().replace(/ /g, "_").toLowerCase();
 
 export const getFakeEntry = (otherValue) => ({
-  text: otherValueToText(otherValue),
+  text: labelKeyToReadable(otherValue),
   value: otherValue,
 });