Facebook: Improved some of the logic for events