Update vlan_vid match according to Table 12 in 1.3.1 spec
Clean code after vlan_vid match fix