Event list bug fixes