Fix channel searching