Events view fix
Events fix