Switch back to having two-clause searches do a simple intersection