Hey Chris! I know that we have plans to simplify some of the logic in there and ensure we're not introducing any inefficiencies during Content Filter processing, so this may naturally get looked at when we get going on that task. I'll make a note of this post there so they can review when we get started. Thanks Chris!