* Fix event type name * Extend list of types only when all_events is specified * Remove flake8 warnings