Add booking count to event response and tidy logic.