Don't search across as many fields (see #1326)