Fix filter source

[martyall]

I have been testing against anvil and hardhat networks recently and since they do lazy mining some of our filtering logic didn't work. These fixes should allow it to work against both types of mining