I've added a check box onto all my major record types called "Subset Searching Kludge" to handle stuff like this