modify for tapir search