diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index e042cc8..ee62e12 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -220,10 +220,13 @@ function AppContent({
         <div style={{ width: "100%", maxWidth: 980, margin: "0 auto" }}>
           <Divider style={{ margin: "8px 0 12px" }} />
           <Paragraph type="secondary">
-            <Link href="mailto:lunchtime@sgruber.at">Feedback</Link> •{" "}
-            <Link href="https://git.sgruber.at/lunchtime" target="_blank">
+            <Link href="https://git.sgruber.at/lunchtime/lunchtime-web" target="_blank">
               Source Code
-            </Link>
+            </Link> •{" "}
+            <Link href="https://git.sgruber.at/lunchtime/lunchtime-menus" target="_blank">
+              Menu Templates
+            </Link> •{" "}
+            <Link href="mailto:lunchtime@sgruber.at">Feedback</Link>
           </Paragraph>
         </div>
       </Footer>
diff --git a/src/frontend/src/components/views/ParticipantCategoryFields.tsx b/src/frontend/src/components/views/ParticipantCategoryFields.tsx
index 87b3744..8347b02 100644
--- a/src/frontend/src/components/views/ParticipantCategoryFields.tsx
+++ b/src/frontend/src/components/views/ParticipantCategoryFields.tsx
@@ -45,6 +45,15 @@ function getCategoryRules(category: OrderFormCategory) {
   ];
 }
 
+function keepLastSelection(value: unknown) {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  const cleaned = value.map((entry) => String(entry).trim()).filter(Boolean);
+  return cleaned.length > 0 ? [cleaned[cleaned.length - 1]] : [];
+}
+
 export default function ParticipantCategoryFields({
   categories,
   isClosed,
@@ -56,15 +65,27 @@ export default function ParticipantCategoryFields({
     const options = toCategoryOptions(category);
     const selectPlaceholder = `Select ${category.label.toLowerCase()}`;
     const rules = getCategoryRules(category);
+    const isSingleCustom = category.custom && !category.multiple;
+    const selectMode = category.custom
+      ? "tags"
+      : category.multiple
+        ? "multiple"
+        : undefined;
     const extra = category.custom
       ? `Your ${category.label.toLowerCase()} of choice. (Custom entries allowed)`
       : `Your ${category.label.toLowerCase()} of choice.`;
 
     return (
       <Col xs={24} md={12} key={category.id}>
-        <Form.Item extra={extra} label={category.label} name={category.id} rules={rules}>
+        <Form.Item
+          extra={extra}
+          label={category.label}
+          name={category.id}
+          rules={rules}
+          getValueFromEvent={isSingleCustom ? keepLastSelection : undefined}
+        >
           <Select
-            mode={category.multiple ? "multiple" : undefined}
+            mode={selectMode}
             allowClear={!category.required}
             showSearch
             placeholder={selectPlaceholder}
diff --git a/src/frontend/src/views/ParticipantView.tsx b/src/frontend/src/views/ParticipantView.tsx
index 14deecd..7a2c8b5 100644
--- a/src/frontend/src/views/ParticipantView.tsx
+++ b/src/frontend/src/views/ParticipantView.tsx
@@ -48,16 +48,29 @@ function serializeSelections(values: NormalizedOrderSelections) {
   return JSON.stringify(values);
 }
 
-function toFormValues(values: NormalizedOrderSelections): FormModel {
+function toFormValues(
+  values: NormalizedOrderSelections,
+  config: OrderFormConfig,
+): FormModel {
   const model: FormModel = {};
 
-  Object.entries(values).forEach(([key, value]) => {
-    if (Array.isArray(value)) {
-      model[key] = value;
+  config.categories.forEach((category) => {
+    const value = values[category.id];
+
+    if (category.multiple) {
+      model[category.id] = Array.isArray(value) ? value : [];
       return;
     }
 
-    model[key] = value ?? undefined;
+    if (category.custom) {
+      const singleValue = Array.isArray(value) ? value[0] : value;
+      const trimmed = typeof singleValue === "string" ? singleValue.trim() : "";
+      model[category.id] = trimmed ? [trimmed] : undefined;
+      return;
+    }
+
+    const singleValue = Array.isArray(value) ? value[0] : value;
+    model[category.id] = singleValue ?? undefined;
   });
 
   return model;
@@ -229,8 +242,9 @@ export default function ParticipantView({ orderId }: { orderId: string }) {
       return;
     }
 
-    form.setFieldsValue(toFormValues(normalizedSavedValues));
+    form.setFieldsValue(toFormValues(normalizedSavedValues, config));
   }, [
+    config,
     existingSubmission,
     form,
     isEditingSubmittedOrder,