Data view filter fix