Added Organizations and more event searching