Fix channel filtering