Fixed search by multiple criteria

Misunderstood requirement in previous implementation, now fixed