Added a if statement to prevent "None" place from being displayed on the event list