fixed logic on events page