Detecting fish variant in a bucket with advancements [1.21]

Hello there <a:pikawave:753275142750208030> TL;DL: Is there a more optimized way to detect fish variants in buckets via advancements, in 1.21? In 1.20, we used to be able to detect fish variants in a bucket this way: json "criteria": { "example": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [{ "items": ["minecraft:tropical_fish_bucket"], "nbt": "{BucketVariantTag: 67764993}" } ] } } } However, what seems to be equivalent to it in 1.21 does not work: json "criteria": { "example": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [{ "items": "minecraft:tropical_fish_bucket", "components": { "minecraft:bucket_entity_data": {"BucketVariantTag": 67764993} } } ] } } } This appear to be due to the condition being an exact match, while the fish also do have Health. I therefore tried the following things, to no avail:json {"BucketVariantTag": 67764993, "Health": 3} {"BucketVariantTag": 67764993, "Health": 3.0} A solution which still works as a partial match is the following:json "criteria": { "example": { "trigger": "minecraft:inventory_changed", "conditions": { "player": { "nbt": "{Inventory:[{components:{\"minecraft:bucket_entity_data\":{BucketVariantTag:67764993}}}]}" } } } } However for some reason, this solution has terrible optimization. Does anyone know about a more optimized way to do this?