Modified logic to display the event location correctly