Fix search by multiple fields