As a mater of fact I did read your post properly, and candidly thought that you would take the time to adapt the proposed solution removing the col and rge CF.
Did you give it a try?

__________________
Using O365 v2503 - Did you know you can thank someone who helped you? Click on the tiny scale in the right upper hand corner of your helper's post