Fix more selector options to choose proper firewall commands