Adding untagged vlan support in general mode