fix #3567: More extras to intent