Improve stream actions selection behavior