Simplified Age / Gender filter

The new search layout feels a lot more difficult to use. I tried filtering for Male Adult, Male Senior, male young adult, monster, and there were no results. I don't want to have to run a search for every category that I might fit. Can we get an All Male/All Female/All Mid-Range filter?

Or possibly make it show all roles included in the selected genders, instead of requiring the results to be all selected genders?