Fixed filter issues v2