EventView bugfixing