Small improvement of the Events view - removed local state