In snow leopard there used to be an option that forced Exposé's "Application Windows" shortcut to show only the active windows of an application's on the presen

In snow leopard there used to be an option that forced Exposé's "Application Windows" shortcut to show only the active windows of an application's on the present desktop. I can't find this option in Lion, and I desperately miss it. Say I have two workspaces each with four terminal windows (each set of terminals connecting to a specific server) and a third workspace with one terminal window sitting around. Pressing the "Application windows" shortcut now shows me all nine windows, and just to add to the confusion OS X Lion switches away from the present workspace to the workspace most recently used! In my view it contradicts the very purpose of "Spaces" since a workspace is used to unclutter all the active apps and windows.