Fixed filter issue