Fixed issues of events showing up when they should not be depending on
the view selected.