Fixing up the filtered view