Support VLANs and fix user-script key