Updated filtering for views