Correcting some changes in events controller