Improved model filtering