fix events without end disappearing
Merge branch 'resourceView-2.1'