Fixing conditional display of event location