Fixed Tapir search. Functionality complete