Fixing default event entity processing