You could make the search always set ALL on a search.
Then it would work for what it can currently do.