Merge pull request #16 from dragos-dumi/master

Synced with production chosen setting
Sync with production
refs #2291 - Added field type to WG
Merge pull request #17 from cristiroma/master

refs #2291 - Added WG type field