improve event bubbling for embedded models