diff --git a/components/Calendar.vue b/components/Calendar.vue
index daad3726..7fd4999f 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -97,6 +97,7 @@
             documentClicked() {
                 if (this.selectedDay) {
                     this.selectedDay = null;
+                    this.$eventHub.$emit('calendar-select', this.selectedDay);
                 }
             },
             selectDay(d) {
diff --git a/components/Logo.vue b/components/Logo.vue
index 5bd73375..5a468b18 100644
--- a/components/Logo.vue
+++ b/components/Logo.vue
@@ -1,6 +1,6 @@
 <template>
     <span v-if="flag"
-          :class="['logo-wrapper rounded-circle d-inline-flex justify-content-center align-items-center', forceShowFlag || forceShowFlagDyn ? 'logo-flag' : '']"
+          :class="['logo-wrapper rounded-circle d-inline-flex justify-content-center align-items-center', forceShowFlag || forceShowFlagDyn ? 'logo-flag-forced' : '', flagName ? 'logo-has-flag' : '']"
           :style="flagName ? `--flag: url('/flags/${flagName}.png')` : ''">
         <span class="logo" v-html="svg"/>
     </span>
@@ -35,7 +35,9 @@ export default {
     },
     methods: {
         selectFlag() {
-            return new ImmutableArray(...calendar.getCurrentYear().eventsByDate[(this.d || this.day).toString()])
+            const events = calendar.getCurrentYear().eventsByDate[(this.d || this.day).toString()];
+            if (!events) { return null; }
+            return new ImmutableArray(...events)
                 .filter(e => e.flag && !e.flag.startsWith('_'))
                 .sorted((a, b) => b.level - a.level)
                 .groupBy(e => e.level)
@@ -82,7 +84,7 @@ export default {
         }
     }
 
-    .logo-wrapper.logo-flag, h1:hover .logo-wrapper {
+    .logo-wrapper.logo-flag-forced.logo-has-flag, h1:hover .logo-wrapper.logo-has-flag {
         svg path {
             stroke: white;
             stroke-width: 10;