Fix channel filtering to work properly