Added when variable for reusing event lists view, other minor changes