One more speed improvement for the event page