refactoring editor.onSelect + fix notif. messages