diff --git a/ogn_python/routes.py b/ogn_python/routes.py
index 28f46f7..54dd5d1 100644
--- a/ogn_python/routes.py
+++ b/ogn_python/routes.py
@@ -127,9 +127,7 @@ def airports():
     countries = get_countries_in_logbook()
 
     if sel_country:
-        airports = db.session.query(Airport) \
-            .filter(Airport.country_code == sel_country) \
-            .order_by(Airport.name)
+        airports = get_airports_in_country(sel_country)
     else:
         airports = []
 
diff --git a/ogn_python/templates/airports.html b/ogn_python/templates/airports.html
index 34ac124..a2c1b34 100644
--- a/ogn_python/templates/airports.html
+++ b/ogn_python/templates/airports.html
@@ -30,8 +30,8 @@
     {% for airport in airports %}
 	<tr>
 	  <td>{{ loop.index }}
-	  <td><img src="{{ url_for('static', filename='img/Transparent.gif') }}" class="flag flag-{{ airport.country_code|lower }}" alt="{{ airport.country_code }}"/> <a href="{{ url_for('airport_detail', airport=airport.id) }}">{{ airport.name }}</a></td>
-	  <td><a href="{{ url_for('logbook', airport=airport.id) }}">Logbook</a></td>
+	  <td><img src="{{ url_for('static', filename='img/Transparent.gif') }}" class="flag flag-{{ sel_country|lower }}" alt="{{ sel_country }}"/> <a href="{{ url_for('airport_detail', airport=airport.id) }}">{{ airport.name }}</a></td>
+	  <td><a href="{{ url_for('logbook', country=sel_country, airport=airport.id) }}">Logbook</a></td>
 	</tr>
 	{% endfor %}
   </table>
diff --git a/ogn_python/templates/logbook.html b/ogn_python/templates/logbook.html
index f677ae4..fb4bb52 100644
--- a/ogn_python/templates/logbook.html
+++ b/ogn_python/templates/logbook.html
@@ -61,8 +61,8 @@
         <td>{% if entry.duration is not none %}{{ entry.duration }}{% endif %}</td>
         <td>{% if entry.max_altitude is not none %}{{ '%0.1f'|format(entry.max_altitude - entry.takeoff_airport.altitude) }} m{% endif %}</td>
         <td>
-        	{% if entry.takeoff_airport is not none and entry.takeoff_airport.id != sel_airport %}Take Off: <img src="{{ url_for('static', filename='img/Transparent.gif') }}" class="flag flag-{{ entry.takeoff_airport.country_code|lower }}" alt="{{ entry.takeoff_airport.country_code }}"/> <a href="{{ url_for('logbook', airport=entry.takeoff_airport.id) }}">{{ entry.takeoff_airport.name }}</a>
-	        {% elif entry.landing_airport is not none and entry.landing_airport.id != sel_airport %}Landing: <img src="{{ url_for('static', filename='img/Transparent.gif') }}" class="flag flag-{{ entry.landing_airport.country_code|lower }}" alt="{{ entry.landing_airport.country_code }}"/> <a href="{{ url_for('logbook', airport=entry.landing_airport.id) }}">{{ entry.landing_airport.name }}</a>
+        	{% if entry.takeoff_airport is not none and entry.takeoff_airport.id != sel_airport %}Take Off: <img src="{{ url_for('static', filename='img/Transparent.gif') }}" class="flag flag-{{ entry.takeoff_airport.country_code|lower }}" alt="{{ entry.takeoff_airport.country_code }}"/> <a href="{{ url_for('logbook', country=entry.takeoff_airport.country_code, airport=entry.takeoff_airport.id, date=sel_date) }}">{{ entry.takeoff_airport.name }}</a>
+	        {% elif entry.landing_airport is not none and entry.landing_airport.id != sel_airport %}Landing: <img src="{{ url_for('static', filename='img/Transparent.gif') }}" class="flag flag-{{ entry.landing_airport.country_code|lower }}" alt="{{ entry.landing_airport.country_code }}"/> <a href="{{ url_for('logbook', country=entry.takeoff_airport.country_code, airport=entry.landing_airport.id, date=sel_date) }}">{{ entry.landing_airport.name }}</a>
 	        {% endif %}
 	    </td>
 	</tr>