Fixed search patterns, part 2