Update listing tables to support EventTypes
Update listing tables to support EventTypes