fixed search with multiple fields