KAT search fixes