Cavalier of Thorns loops if type not on top to reveal cards

[Aswan jaguar]

Describe the Bug:
Cavalier of Thorns & Tracker's Instincts loop for ever if the object - type they search for to put onto X area is not on the cards they reveal.

Which update are you using? (date, name)Which type? (duel, gauntlet, sealed deck)
October 2022 - From Rebels & Rhystics to Pathways & Pests - Hotfix/ duel

What exactly should be the correct behavior/interaction?
No loop.
Imho we need a separate function for these kind of cards( Only these two so far from those we have coded so far ) that:
1) should reveal top number of cards (not just look at those cards for player but reveal when opponent casts them)
2) force you to select one card of that type and
3) put that specific type of card (not any which works fine)
4) and also not loop if there isn't such a card on the number of cards to reveal
5) and not force you to select that type of card when cards are revealed if there isn't a card of that type.

The functions we already have in my tests fail in one or more of above. I tried to change existing functions but always made things worse.

Are any other cards possibly affected by this bug?
-