Added filter by coordination hubs and fixed upcoming events issue