Fix tapir search.