I meant to comment this earlier, but as @Ben_H helped me identify there is still an issue in my above code. The easiest way to implement this with both filters and history is to use the repo @jiayi-wu directed me to while debugging this. Hope that helps, sorry for anyone I lead astray with the above.