diff --git a/app/templates/index.html b/app/templates/index.html
index df6044e..d9dd2ca 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -37,7 +37,7 @@
         <img src="{{ pc.image_front }}" alt="" class="showcase-card-img" loading="lazy">
         <div class="showcase-card-body">
             <div class="showcase-card-meta">
-                {% if pc.country_to_from and pc.country_to %}<span>{{ pc.country_to_from|flag }} {{ pc.country_to_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
+                {% if pc.country_from and pc.country_to %}<span>{{ pc.country_from|flag }} {{ pc.country_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
                 {% elif pc.country_to %}<span>{{ pc.country_to|flag }} {{ pc.country_to }}</span>
                 {% endif %}
             </div>
diff --git a/app/templates/postcard_detail.html b/app/templates/postcard_detail.html
index ef98b4a..fedc0ac 100644
--- a/app/templates/postcard_detail.html
+++ b/app/templates/postcard_detail.html
@@ -52,12 +52,12 @@
             <dt>{{ 'pc_detail.status'|t(user.language) }}</dt><dd>{{ {'sent':'已寄出','delivered':'已送达','received':'已收到'}.get(postcard.status, postcard.status) if user.language=='zh' else {'sent':'Sent','delivered':'Delivered','received':'Received'}.get(postcard.status, postcard.status) }}</dd>
             {% if postcard.status in ('sent','delivered') %}
             <dt>{{ 'pc_detail.recipient'|t(user.language) }}</dt><dd>{{ postcard.recipient_name or '-' }}</dd>
-            <dt>{{ 'pc_detail.route'|t(user.language) }}</dt><dd>{% if postcard.country_to_from %}{{ postcard.country_to_from|flag }} {{ postcard.country_to_from }} → {% endif %}{{ postcard.country_to|flag }} {{ postcard.country_to or '-' }}</dd>
+            <dt>{{ 'pc_detail.route'|t(user.language) }}</dt><dd>{% if postcard.country_from %}{{ postcard.country_from|flag }} {{ postcard.country_from }} → {% endif %}{{ postcard.country_to|flag }} {{ postcard.country_to or '-' }}</dd>
             <dt>{{ 'pc_detail.send_time'|t(user.language) }}</dt><dd>{{ postcard.send_time.strftime('%Y-%m-%d') if postcard.send_time else '-' }}</dd>
             <dt>{{ 'pc_detail.arrival_time'|t(user.language) }}</dt><dd>{{ postcard.arrival_time.strftime('%Y-%m-%d') if postcard.arrival_time else '-' }}</dd>
             {% else %}
             <dt>{{ 'pc_detail.sender'|t(user.language) }}</dt><dd>{{ postcard.sender_name or '-' }}</dd>
-            <dt>{{ 'pc_detail.route'|t(user.language) }}</dt><dd>{% if postcard.country_to_from %}{{ postcard.country_to_from|flag }} {{ postcard.country_to_from }} → {% endif %}{{ postcard.country_to|flag }} {{ postcard.country_to or '-' }}</dd>
+            <dt>{{ 'pc_detail.route'|t(user.language) }}</dt><dd>{% if postcard.country_from %}{{ postcard.country_from|flag }} {{ postcard.country_from }} → {% endif %}{{ postcard.country_to|flag }} {{ postcard.country_to or '-' }}</dd>
             <dt>{{ 'pc_detail.receive_time'|t(user.language) }}</dt><dd>{{ postcard.receive_time.strftime('%Y-%m-%d') if postcard.receive_time else '-' }}</dd>
             {% endif %}
             <dt>{{ 'pc_detail.profile'|t(user.language) }}</dt><dd>{{ postcard.profile.nickname }}</dd>
diff --git a/app/templates/postcard_form.html b/app/templates/postcard_form.html
index 6ea0bd2..4396445 100644
--- a/app/templates/postcard_form.html
+++ b/app/templates/postcard_form.html
@@ -32,7 +32,7 @@
     </div>
 
     <label>{{ 'pc_form.country_from'|t(user.language) }}</label>
-    <input type="text" name="country_from" id="input-country-from" value="{{ postcard.country_to_from if postcard and postcard.country_to_from else (profile.country if profile else '') }}" maxlength="2" style="width:80px;text-transform:uppercase" oninput="this.value=this.value.toUpperCase()">
+    <input type="text" name="country_from" id="input-country-from" value="{{ postcard.country_from if postcard and postcard.country_from else (profile.country if profile else '') }}" maxlength="2" style="width:80px;text-transform:uppercase" oninput="this.value=this.value.toUpperCase()">
 
     <label>{{ 'pc_form.country'|t(user.language) }} *</label>
     <input type="text" name="country_to" id="input-country-to" value="{{ postcard.country_to if postcard else '' }}" maxlength="2" placeholder="JP" style="width:80px;text-transform:uppercase" oninput="this.value=this.value.toUpperCase()">
diff --git a/app/templates/postcards.html b/app/templates/postcards.html
index 6c19cdd..ee0ce02 100644
--- a/app/templates/postcards.html
+++ b/app/templates/postcards.html
@@ -41,7 +41,7 @@
     <div class="postcard-row-info">
         <strong>{{ pc.card_number }}</strong>
         <div class="postcard-row-detail">
-            <span>{% if pc.country_to_from %}{{ pc.country_to_from|flag }}→{% endif %}{{ pc.country_to|flag }} {{ pc.country_to or '-' }}</span>
+            <span>{% if pc.country_from %}{{ pc.country_from|flag }}→{% endif %}{{ pc.country_to|flag }} {{ pc.country_to or '-' }}</span>
             <span>→ {{ pc.recipient_name or '-' }}</span>
         </div>
         <span class="badge badge-{{ pc.status }}">{{ {'sent':'已寄出','delivered':'已送达'}.get(pc.status) if user.language=='zh' else {'sent':'Sent','delivered':'Delivered'}.get(pc.status) }}</span>
diff --git a/app/templates/showcase.html b/app/templates/showcase.html
index 2a562d8..0f9b483 100644
--- a/app/templates/showcase.html
+++ b/app/templates/showcase.html
@@ -49,8 +49,8 @@
             <img src="{{ pc.image_front }}" alt="" class="showcase-card-img" loading="lazy">
             <div class="showcase-card-body">
                 <div class="showcase-card-meta">
-                    {% if pc.country_to_from and pc.country_to %}<span>{{ pc.country_to_from|flag }} {{ pc.country_to_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
-                    {% elif pc.country_to %}<span>{{ pc.country_to|flag }}</span>
+                    {% if pc.country_from and pc.country_to %}<span>{{ pc.country_from|flag }} {{ pc.country_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
+                    {% elif pc.country_to %}<span>{{ pc.country_to|flag }} {{ pc.country_to }}</span>
                     {% endif %}
                     {% if pc.send_time %}<span>{{ pc.send_time.strftime('%Y-%m-%d') }}</span>{% endif %}
                 </div>
@@ -74,8 +74,8 @@
             <img src="{{ pc.image_front }}" alt="" class="showcase-card-img" loading="lazy">
             <div class="showcase-card-body">
                 <div class="showcase-card-meta">
-                    {% if pc.country_to_from and pc.country_to %}<span>{{ pc.country_to_from|flag }} {{ pc.country_to_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
-                    {% elif pc.country_to %}<span>{{ pc.country_to|flag }}</span>
+                    {% if pc.country_from and pc.country_to %}<span>{{ pc.country_from|flag }} {{ pc.country_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
+                    {% elif pc.country_to %}<span>{{ pc.country_to|flag }} {{ pc.country_to }}</span>
                     {% endif %}
                     {% if pc.send_time %}<span>{{ pc.send_time.strftime('%Y-%m-%d') }}</span>{% endif %}
                 </div>
@@ -100,8 +100,8 @@
             <img src="{{ pc.image_front }}" alt="" class="showcase-card-img" loading="lazy">
             <div class="showcase-card-body">
                 <div class="showcase-card-meta">
-                    {% if pc.country_to_from and pc.country_to %}<span>{{ pc.country_to_from|flag }} {{ pc.country_to_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
-                    {% elif pc.country_to %}<span>{{ pc.country_to|flag }}</span>
+                    {% if pc.country_from and pc.country_to %}<span>{{ pc.country_from|flag }} {{ pc.country_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
+                    {% elif pc.country_to %}<span>{{ pc.country_to|flag }} {{ pc.country_to }}</span>
                     {% endif %}
                     {% if pc.receive_time %}<span>{{ pc.receive_time.strftime('%Y-%m-%d') }}</span>{% endif %}
                 </div>
@@ -125,8 +125,8 @@
             <img src="{{ pc.image_front }}" alt="" class="showcase-card-img" loading="lazy">
             <div class="showcase-card-body">
                 <div class="showcase-card-meta">
-                    {% if pc.country_to_from and pc.country_to %}<span>{{ pc.country_to_from|flag }} {{ pc.country_to_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
-                    {% elif pc.country_to %}<span>{{ pc.country_to|flag }}</span>
+                    {% if pc.country_from and pc.country_to %}<span>{{ pc.country_from|flag }} {{ pc.country_from }} → {{ pc.country_to|flag }} {{ pc.country_to }}</span>
+                    {% elif pc.country_to %}<span>{{ pc.country_to|flag }} {{ pc.country_to }}</span>
                     {% endif %}
                     {% if pc.receive_time %}<span>{{ pc.receive_time.strftime('%Y-%m-%d') }}</span>{% endif %}
                 </div>