Shopify Canonicals for Tagged Filters

[vgusvg]

I've been researching this topic endlessly and thought I had arrived at a solution but Screaming Frog indicates my solution was not successful.

Problem: I used tags to filter my collections pages. The result, I discovered, was the creation of dozens and dozens, maybe hundreds, of additional collection URLs for each possible permutation of tag filters. I would like to make the collection page URL, with no tag filters, the canonical.

Proposed Solution:  I found the following code described somewhere as the solution:

{% if template contains 'collection' and current_tags %}

{% else %}

{% endif %}

However, I crawled my site with Screaming Frog and found that the canonical link element is still listed as the URL with the tags included.  The crawler does recognizes the "noindex" instruction.  Any ideas on what the best move is here?