major improvements to filtering pipeline