discovery refactoring P4 - bug fixes & actor added event provide scope