fix channel/frequency choice logic