FIX: Fixed filter pattern match