I havent modified the installation. I think 3.1.6 was there as well. Unfortunately not on site so will have to go there to check the options.
Its an older switch but essentially the same. Imagine port1 is that tagged ports the connected to the firewall and port 3 or 19 untagged to put a laptop directly to vlan20