*Almost* perfect file tagging - need help with last bit

The backbone of my file organization is in a simple structure. I use `XXX and yyy - q as the structure of all tags and then sort first based on the `XXXX (which is a client name) and then into subfolders based on yyy - q (which is a type of document). From there, I sort based on year. So all I have to do is tag a file with that structure in my capture folder and then it sorts into a separate folder, which processes into subfolders. That portion of the process looks like this:

Capture folder rule:
https://share.cleanshot.com/r2bFt8Yx

Sorting folder rule:
https://share.cleanshot.com/M3PRsY2G

https://share.cleanshot.com/M3PRsY2G

So this works almost perfectly. The one thing I need to do is add appropriate tags to the folders I just created. If I tag test.doc with `XXX and yyy - q, it sorts into

XXX (no tags)
(subfolder) yyy (no tags)
test.doc (`XXX yyy - q)

I want it to sort like this:
XXX (`XXX)
(subfolder) yyy (`XXX yyy - q)
test.doc (`XXX yyy - q)

The reason I want to do this is that sometimes I close out a client and rename the client from `XXX to xxXXX. I have a rule that will move that whole file/folder into a Closedfile folder. If I can get the top folder to automatically tag at the outset, then all I need to do is change the tag and everything sorts properly. (I also have the Closedfile to the same thing the other direction so that if I reopen a client, I just change xxXXX to `XXX and it moves right back.)

I'd be grateful for any help you can give to automatically tag apply the appropriate tags to the folders as it's sorting into subfolders. Thanks!