diff --git a/templates/launches.html b/templates/launches.html
index 9e725df..47dbd05 100644
--- a/templates/launches.html
+++ b/templates/launches.html
@@ -72,7 +72,7 @@
       </div>
       <div class="col">
         <div>
-        {{ country.flag }}
+        <abbr title="{{ country.name }}">{{ country.flag }}</abbr>
         {{ launch.rocket.full_name }}
         &ndash;
         <strong>{{launch.mission.name }}</strong>
@@ -100,9 +100,10 @@
         {% if launch.mission.agencies | count %}
         <div>
           {% for agency in launch.mission.agencies %}
+            {% set agency_country = get_country(agency.country_code) %}
             {%- if not loop.first %}, {% endif %}
             <a href="{{ agency.wiki_url }}">{{agency.name }}</a>
-            {{ get_country(agency.country_code).flag }}
+            <abbr title="{{ agency_country.name }}">{{ agency_country.flag }}</abbr>
             ({{ agency.type }}) {# <img src="{{ agency.logo_url }}"/> #}
           {% endfor %}
         </div>