Fixed some logic issues I had created with new snapshot filtering