bugfixes event selection by type