More fixes for conditional display of event locations