Added attendant search and fixed event type