Filtering updated to use new models