Wow, that is uh, uh, ugly!! I think I figured out what @v-cherch-msft did though. I was able to replicate it in Table24 of attached. Is the file something that you can share? If so, I am fairly certain that I could replicate the procedure. If not, perhaps I could make a video for you that walks you through what was done.
Thanks a lot @v-cherch-msft I attempted changing the source in the file you shared, however, I am ending up with an error in the Advanced Query Editory everytime. As bizzare as this may sound, i spent the entire day on this yesterday.